diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 6fcdc4d76ec..62eb1bb5c47 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7556
\ No newline at end of file
+7557
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
index 67a901f0e32..5549b516d86 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
@@ -150,6 +150,8 @@
                 [% ELSE %]
                   matched
                   <b>[% query.value.users.0.identity FILTER html %]</b>
+                  <input type="hidden" name="[% field.key FILTER html %]"
+                         value="[% query.value.users.0.login FILTER html %]">
                 [% END %]
             [% ELSE %]
                 [% IF (query.key.length < 3) && !Param('emailsuffix') %]
@@ -174,7 +176,10 @@
 
 [% IF matchsuccess == 1 %]
 
-  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+  [% SET exclude_these = 
+           matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %]
+  [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
+  [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
 
   <p>
     <input type="submit" id="continue" value="Continue">