Index: branches/RC/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r11139 -r11538
--- branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 11538)
@@ -1,6 +1,6 @@
 <inp2:adm_SetPopupSize width="564" height="377"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" perm_section="ADMIN" permission_type="" pagination="0" prefix="u" title_preset="admins_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" perm_section="ADMIN" permission_type="" prefix="u" title_preset="admins_edit"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -27,14 +27,18 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
+
+<div id="scroll_container">
+	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_RenderElement name="inp_label" 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="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<inp2:m_RenderElement name="inp_label" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_RenderElement name="inp_label" prefix="u" field="Email" title="la_fld_Email"/>
-</table>
+		<inp2:m_RenderElement name="inp_edit_filler" />
+	</table>
+</div>
 
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file