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 c05922bf8d..702c040c29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1205,7 +1205,9 @@ $(document).ready(function() {
                 if ( skipped_fields.indexOf( input_label ) != -1 ) { input_label=""; }
                 if( qaddfields.indexOf( input_label ) != -1 || $(this).attr('class') == 'required' ){
                    $(this).parent().clone().appendTo("#quick_add_list");
-                   if( input_label == 'password') $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
+                   [% UNLESS mandatorypassword %]
+                         if( input_label == 'password' ) $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
+                   [% END %]
                 }
             });
                 if( $("#memberentry_guarantor").length ) {