Index: branches/unlabeled/unlabeled-1.3.62/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r7857 -r10033
--- branches/unlabeled/unlabeled-1.3.62/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7857)
+++ branches/unlabeled/unlabeled-1.3.62/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 10033)
@@ -1,6 +1,10 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit"/>
+<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="proj-base/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>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -38,18 +42,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="u" function="IsSingle"/>
+				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="u" function="IsLast"/>
+					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="u" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -62,13 +66,13 @@
 <input type="hidden" name="user_group" value="11"/>
 <div id="scroll_container">
 <table class="edit-form">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+		<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="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>