diff --git a/cgi/user2.pl b/cgi/user2.pl
index 56216d15ad0a2..bc6f0d13993ac 100644
--- a/cgi/user2.pl
+++ b/cgi/user2.pl
@@ -160,8 +160,6 @@
 	}
 
 	$template_data_ref->{user_ref} = $user_ref;
-	$template_data_ref->{user_id_field} = $user_ref->{userid};
-	$template_data_ref->{user_password_field} = $user_ref->{password};
 
 	# Create the list of sections and fields
 
diff --git a/templates/user_form2.tt.html b/templates/user_form2.tt.html
index 52eca1472ff71..75feaf4496b1e 100644
--- a/templates/user_form2.tt.html
+++ b/templates/user_form2.tt.html
@@ -61,7 +61,7 @@
                 [% IF field.field == 'userid' %]
                     [% IF type == 'edit' %]
                         <label for="[% field.field %]"> [% lang(field.label) %]</label>
-                        <p> [% user_id_field %] </p>
+                        <p> [% field.value %] </p>
                     [% ELSE %]
                         <label for="[% field.field %]">  [% lang(field.label) %] [% lang('username_info')  %]</label>
                         <input type="text" id="[% field.field %]" name="[% field.field %]" value="[% field.value %]" autocomplete="[% field.field %]" onkeyup="normalize_string_value(this)" />
@@ -73,7 +73,7 @@
                         </div>
                 [% ELSIF field.type == 'password' %]
                     <label for="[% field.field %]">[% lang(field.label) %]</label>
-                    <input type="password" id="[% field.field %]" name="[% field.field %]" value="[% user_password_field %]" autocomplete="new-password"/>
+                    <input type="password" id="[% field.field %]" name="[% field.field %]" value="[% field.value %]" autocomplete="new-password"/>
                 [% ELSIF field.type == 'email' %]
                     <label for="[% field.field %]">	[% field.label %]</label>
                     <input type="email" id="[% field.field %]" name="[% field.field %]" value = "[% field.value %]" autocomplete="[% field.field %]"/>