Index: mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl,v
retrieving revision 1.16
diff -pU20 -r1.16 mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
@@ -67,80 +67,86 @@
     the names and/or email addresses you entered on the previous page.<br>
     Please go back and try other names or email addresses.
   </p>
 [% END %]
 
   <table border="0">
     <tr>
       <td colspan="2">
         <hr width="100%" size="1">
       </td>
     </tr>
 
   [%# this is messy to allow later expansion %]
 
   [% FOREACH field = matches %]
     <tr>
       <td align="left" valign="top">
         [% PROCESS field_names field_name=field.key %]:
       </td>
       <td align="left" valign="top">
-          [% FOREACH query = field.value %]
-              <b>[% query.key FILTER html %]</b>
+        [% break = 0 %]
+        [% FOREACH query = field.value %]
+          [% IF break %]
+            <br>
+          [% ELSE %]
+            [% break = 1 %]
+          [% END %]
+          <b>[% query.key FILTER html %]</b>
             [% IF query.value.users.size %]
                 [% IF query.value.users.size > 1 %]
                   [% IF query.value.status == 'fail' %]
                     <font color="#FF0000">
                       matches multiple users.
                     </font>
                     Please go back and try again with a more specific
                     name/address.
                   [% ELSE %]
                     [% IF query.value.status == 'trunc' %]
                       matched
                       more than the maximum
-                      of [% query.value.users.size %] users:<br>
+                      of [% query.value.users.size %] users:
                     [% ELSE %]
-                      matched:<br>
+                      matched:
                     [% END %]
+                    <br>
                     <select name="[% field.key FILTER html %]"
                      id="[% field.key FILTER html %]"
                       [% IF fields.${field.key}.type == 'multi' %]
                         multiple="multiple"
                         [% IF query.value.users.size > 5 %]
                          size="5"
                         [% ELSE %]
                          size="[% query.value.users.size %]"
                         [% END %]
                       [% END %]
                     >
                       [% FOREACH match = query.value.users %]
                         <option value="[% match.login FILTER html %]">
                          [%- match.identity FILTER html -%]
                         </option>
                       [% END %]
                     </select>
                   [% END %]
                 [% ELSE %]
                   matched
                   <b>[% query.value.users.0.identity FILTER html %]</b>
-                  <br>
                 [% END %]
             [% ELSE %]
                 [% IF (query.key.length < 3) && !(Param('emailsuffix'))
                     && (Param('usermatchmode') == 'search') %]
                   <font color="#FF0000">was too short for substring match
                   (minimum 3 characters)</font>
                 [% ELSE %]
                   <font color="#FF0000">did not match anything</font>
                 [% END %]
             [% END %]
         [% END %]
       </td>
     </tr>
     <tr>
       <td colspan="2">
         <hr width="100%" size="1">
       </td>
     </tr>
   [% END %]