Index: branches/RC/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r11140 -r11538
--- branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11140)
+++ branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11538)
@@ -1,11 +1,9 @@
-<inp2:adm_SetPopupSize width="550" height="425"/>
+<inp2:adm_SetPopupSize width="720" height="500"/>
+
 <inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="users_edit" tab_preset="Default"/>
 
-	<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-		<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="users_edit" tab_preset="Default"/>
-	<inp2:m_else/>
-		<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="users_edit" tab_preset="RegularUsers"/>
-	</inp2:m_if>
+
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -61,49 +59,49 @@
 				);
 			</script>
 		</td>
-		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
-<table class="edit-form">
-	<inp2:m_RenderElement name="subsection" 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"/>
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" 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="subsection" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
-		<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="Company" title="la_fld_Company"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="la_prompt_birthday"/> <!-- OLD PHRASE, la_fld_BirthDate -->
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="la_fld_Phone"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="la_fld_Fax"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="la_fld_AddressLine1"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="la_fld_AddressLine2"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="la_fld_City"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="la_fld_State"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="la_fld_Zip"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Country" title="la_fld_Country" has_empty="1"/>
+		<inp2:m_RenderElement name="subsection" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
+			<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="Company" title="la_fld_Company"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="la_prompt_birthday"/> <!-- OLD PHRASE, la_fld_BirthDate -->
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="la_fld_Phone"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="la_fld_Fax"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="la_fld_AddressLine1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="la_fld_AddressLine2"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="la_fld_City"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="la_fld_State"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="la_fld_Zip"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Country" title="la_fld_Country" has_empty="1"/>
 
-	<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status" title="la_fld_Status"/>
-		<inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn" title="la_fld_CreatedOn"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn" title="la_fld_CreatedOn"/>
 
-	<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-		<!-- custom fields: begin -->
-		<inp2:m_include t="incs/custom_blocks"/>
-		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="u" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
-		<!-- custom fields: end -->
-	</inp2:m_if>
+		<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+			<!-- custom fields: begin -->
+			<inp2:m_include t="incs/custom_blocks"/>
+			<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="u" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
+			<!-- custom fields: end -->
+		</inp2:m_if>
 
-	<inp2:m_RenderElement name="inp_edit_filler"/>
-</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