Index: branches/RC/kernel/admin_templates/users/user_edit_images.tpl
===================================================================
diff -u -N -r11096 -r11140
--- branches/RC/kernel/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 11096)
+++ branches/RC/kernel/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 11140)
@@ -13,7 +13,7 @@
 
   				function edit()
 	  			{
-	  				std_edit_temp_item('u-img', 'in-portal/users/image_edit');
+	  				std_edit_temp_item('u-img', 'users/image_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
@@ -42,7 +42,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('new_image', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>',
 						function() {
-							std_new_item('u-img', 'in-portal/users/image_edit')
+							std_new_item('u-img', 'users/image_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
Index: branches/RC/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r11139 -r11140
--- branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11140)
@@ -1,11 +1,8 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_if check="m_ConfigEquals" name="AdvancedUserManagement" value="1">
-	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="users/admins_edit_tabs"/>
-<inp2:m_else/>
-	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit"/>
-</inp2:m_if>
 
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
+
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -54,6 +51,13 @@
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
+
+				addLoadEvent(
+					function() {
+						// fixes Firefox 2.0+ bug will password autocomplete
+						document.getElementById('<inp2:u_InputName field="Password"/>').value = '';
+					}
+				);
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
Index: branches/RC/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -N -r11139 -r11140
--- branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11140)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="users/admins_edit_tabs"/>
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r11139 -r11140
--- branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11140)
@@ -1,6 +1,11 @@
 <inp2:adm_SetPopupSize width="550" height="425"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" pagination="0" prefix="u" title_preset="admins_edit"/>
+
+	<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>
@@ -17,7 +22,7 @@
 						}
 				 ) );
 
-			 a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+			 	a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 						reset_form('u', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 			 	) );
@@ -33,8 +38,6 @@
 						}
 				 ) );
 
-
-
 				a_toolbar.Render();
 
 				<inp2:m_if check="u_IsSingle" >
@@ -49,6 +52,13 @@
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
+
+				addLoadEvent(
+					function() {
+						// fixes Firefox 2.0+ bug will password autocomplete
+						document.getElementById('<inp2:u_InputName field="Password"/>').value = '';
+					}
+				);
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -60,15 +70,39 @@
 <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"/>
+
+	<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_options" prefix="u" field="Country" title="la_fld_Country" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
+		<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_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>
 </div>
 
Index: branches/RC/kernel/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r11096 -r11140
--- branches/RC/kernel/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11096)
+++ branches/RC/kernel/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11140)
@@ -73,7 +73,7 @@
 		<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_Phone"/>
+		<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"/>
Index: branches/RC/kernel/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r11132 -r11140
--- branches/RC/kernel/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11132)
+++ branches/RC/kernel/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11140)
@@ -11,13 +11,13 @@
 	  			//do not rename - this function is used in default grid for double click!
 	  			function edit()
 	  			{
-	  				std_edit_item('u', 'in-portal/users/users_edit');
+	  				std_edit_item('u', 'users/users_edit');
 	  			}
 
 	  			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('in-portal:new_user', '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>',
 						function() {
-							std_precreate_item('u', 'in-portal/users/users_edit')
+							std_precreate_item('u', 'users/users_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
Index: branches/RC/core/admin_templates/users/admins_edit_tabs.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/users/admins_edit_tabs.tpl	(revision 11139)
+++ branches/RC/core/admin_templates/users/admins_edit_tabs.tpl	(revision 0)
@@ -1,12 +0,0 @@
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="right" width="100%">
-	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-			<tr>
-				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="users/admins_edit" main_prefix="u"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Groups" t="users/admins_edit_groups" main_prefix="u"/>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -N -r11132 -r11140
--- branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11132)
+++ branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11140)
@@ -11,7 +11,7 @@
 				//do not rename - this function is used in default grid for double click!
 	  			function edit()
 	  			{
-	  				std_edit_temp_item('u-ug', 'in-portal/users/user_edit_group');
+	  				std_edit_temp_item('u-ug', 'users/user_edit_group');
 	  			}
 
 	  			a_toolbar = new ToolBar();