diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index a4cee866f3..fc6f59d4fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1162,6 +1162,9 @@
                                             <li>
                                                 <label for="userid" [% IF mandatoryuserid %]class="required"[% END %]> Username: </label>
 
+                                                [%# Dummy input to avoid Firefox from using userid/password saved for authentication %]
+                                                <input type="text" disabled="disabled" style="display:none" />
+
                                                 [% IF ( NoUpdateLogin ) %]
                                                     [% IF ( op == 'duplicate' ) %]
                                                         <input type="text" id="userid" name="userid" size="20" disabled="disabled" />
@@ -1176,9 +1179,6 @@
                                                     [% END %]
                                                 [% END # /IF ( NoUpdateLogin ) %]
 
-                                                [%# Dummy input to avoid Firefox from using userid/password saved for authentication %]
-                                                <input type="text" disabled="disabled" style="display:none" />
-
                                                 [% IF ( mandatoryuserid ) %]
                                                     <span class="required">Required</span>
                                                 [% END %]