Index: branches/5.2.x/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r14244 -r14468
--- branches/5.2.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 14468)
@@ -58,14 +58,14 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
+<inp2:m_include template="users/user_blocks"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-			<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-			<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+			<inp2:m_RenderElement name="password_fields" />
 
 		<inp2:m_RenderElement name="subsection" prefix="u" fields="FirstName,LastName,Company,Email,dob,Phone,Fax,Street,Street2,City,State,Zip,Country" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
@@ -98,4 +98,12 @@
 	</table>
 </div>
 
+<script type="text/javascript">
+	$(document).ready(
+		function() {
+			<inp2:m_RenderElement name="password_fields_js" />
+		}
+	);
+</script>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file