Index: branches/5.2.x/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r14437 -r14468
--- branches/5.2.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 14437)
+++ branches/5.2.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 14468)
@@ -59,6 +59,7 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
+<inp2:m_include template="users/user_blocks"/>
 
 <inp2:m_RenderElement name="inp_edit_hidden" prefix="u" field="UserType"/>
 <inp2:m_RenderElement name="inp_edit_hidden" prefix="u" field="PrimaryGroupId"/>
@@ -67,13 +68,21 @@
 	<table class="edit-form">
 		<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="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</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