Index: branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_tabs.tpl
===================================================================
diff -u -N
--- branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_tabs.tpl	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_tabs.tpl	(revision 10033)
@@ -0,0 +1,12 @@
+<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="proj-base/users/admins_edit" main_prefix="u"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Groups" t="proj-base/users/admins_edit_groups" main_prefix="u"/>
+			</tr>
+		</table>
+	</td>
+</tr>
+</table>
\ No newline at end of file
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>
Index: branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/user_selector.tpl
===================================================================
diff -u -N
--- branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/user_selector.tpl	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/user_selector.tpl	(revision 10033)
@@ -0,0 +1,47 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="users_select" module="in-portal" icon="icon46_users"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+	  	<td>
+	  		<script type="text/javascript">
+					a_toolbar = new ToolBar();
+	  				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', edit) );
+					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+								window.close();
+							}
+					 	) );
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+								show_viewmenu(a_toolbar,'view');
+							}
+					) );
+
+					a_toolbar.Render();
+
+					function edit()
+					{
+						set_hidden_field('remove_specials[u.group]', 1);
+						submit_event('<inp2:m_recall name="main_prefix"/>', 'OnProcessSelected');
+					}
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.group" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['u.group'].SetDependantToolbarButtons( new Array('select') );
+//	Grids['u.group'].EnableRadioMode();
+//	Grids['u'].DblClick = function() {return false};
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -N
--- branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_groups.tpl	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.4/core/admin_templates/users/admins_edit_groups.tpl	(revision 10033)
@@ -0,0 +1,100 @@
+<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="proj-base/users/admins_edit_tabs"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				//do not rename - this function is used in default grid for double click!
+	  			function edit()
+	  			{
+
+	  			}
+
+	  			a_toolbar = new ToolBar();
+
+	  			a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('proj-base:usertogroup', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('u-ug', '<inp2:m_Link t="proj-base/users/group_selector" pass="m,u"/>', 'GroupId', '800x600');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('u-ug');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('proj-base:primary_group', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
+						function() {
+							submit_event('u-ug','OnSetPrimary');
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_membership_td">
+	<inp2:m_if check="Field" name="$field" db="db">
+		<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+	<inp2:m_else/>
+		<inp2:m_phrase name="la_NeverExpires"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_ParseBlock name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
+<script type="text/javascript">
+	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'primary_group') );
+</script>
+
+<input type="hidden" name="u_mode" value="t<inp2:m_Get var="m_wid" />" />
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file