Index: branches/RC/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -N -r11482 -r11538
--- branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 11538)
@@ -1,8 +1,8 @@
 <inp2:adm_SetPopupSize width="564" height="377"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_set u_id="-1"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:admins" pagination="0" prefix="u" title_preset="root_edit"/>
 
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="root_edit"/>
+
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -28,9 +28,13 @@
 
 <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_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
 		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
-</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