Index: branches/RC/core/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -N -r11142 -r11143
--- branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11142)
+++ branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11143)
@@ -103,7 +103,7 @@
 
 <inp2:m_RenderElement 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') );
+	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'primary_group') );
 </script>
 
 <input type="hidden" name="u_mode" value="t<inp2:m_Get var="m_wid" />" />
Index: branches/RC/core/admin_templates/users/admin_edit_group.tpl
===================================================================
diff -u -N -r11141 -r11143
--- branches/RC/core/admin_templates/users/admin_edit_group.tpl	(.../admin_edit_group.tpl)	(revision 11141)
+++ branches/RC/core/admin_templates/users/admin_edit_group.tpl	(.../admin_edit_group.tpl)	(revision 11143)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" prefix="u" title_preset="user_edit_group"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="user_edit_group"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/units/general/helpers/sections_helper.php
===================================================================
diff -u -N -r11135 -r11143
--- branches/RC/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 11135)
+++ branches/RC/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 11143)
@@ -181,6 +181,10 @@
 
 				$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
 
+				if ($current_data) {
+					trigger_error('Section "<strong>' . $section_name . '</strong>" declaration (originally defined in "<strong>' . $current_data['SectionPrefix'] . '</strong>") was overwriten from "<strong>' . $prefix . '</strong>"', E_USER_NOTICE);
+				}
+
 				$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);
 			}
 		}
Index: branches/RC/core/admin_templates/js/script.js
===================================================================
diff -u -N -r11087 -r11143
--- branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11087)
+++ branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11143)
@@ -561,13 +561,10 @@
 {
 	set_hidden_field('PrefixSpecial', prefix_special);
 	set_hidden_field('grid', grid);
-	if (use_popups(prefix_special, '')) {
-		open_popup(prefix_special, '', template);
-	}
-	else {
-	 	submit_event(prefix_special, '', template);
- 	}
+
+	open_popup(prefix_special, '', template);
 }
+
 function std_csv_import(prefix_special, grid, template)
 {
 	set_hidden_field('PrefixSpecial', prefix_special);
@@ -579,6 +576,7 @@
 	 	submit_event(prefix_special, '', template);
  	}
 }
+
 // set current form base on ajax
 function set_form($prefix_special, $ajax)
 {
Index: branches/RC/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -N -r10999 -r11143
--- branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 10999)
+++ branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11143)
@@ -40,7 +40,7 @@
 				'label'			=>	'la_tab_BanList',
 				'url'			=>	Array('t' => 'ban_rules/ban_rule_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-				'priority'		=>	6,
+				'priority'		=>	7,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/RC/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r11140 -r11143
--- branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11140)
+++ branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11143)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" 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/admins_edit_groups.tpl
===================================================================
diff -u -N -r11142 -r11143
--- branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11142)
+++ branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11143)
@@ -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="user_edit_groups" tab_preset="Admins"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" pagination="0" prefix="u" title_preset="user_edit_groups" tab_preset="Admins"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -99,7 +99,7 @@
 
 <inp2:m_RenderElement 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') );
+	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'primary_group') );
 </script>
 
 <input type="hidden" name="u_mode" value="t<inp2:m_Get var="m_wid" />" />
Index: branches/RC/kernel/admin_templates/users/image_edit.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/users/image_edit.tpl	(revision 11096)
+++ branches/RC/kernel/admin_templates/users/image_edit.tpl	(revision 0)
@@ -1,60 +0,0 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
-
-<inp2:m_include t="incs/image_blocks"/>
-
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
-<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_users" module="in-portal" title="!la_title_Users!"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="user_image_edit" 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"/>', function() {
-							submit_event('u-img','<inp2:u-img_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('u-img','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
-		<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
-		<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
-
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
-
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
-
-	<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
-		<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
-
-	<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
-		<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
-
-</table>
-
-<script type="text/javascript">
-	<inp2:m_RenderElement name="images_edit_js" prefix="u-img"/>
-	toggle_fullsize();
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -N -r11139 -r11143
--- branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 11143)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="1" prefix="u.admins" title_preset="" grid="Admins" />
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" pagination="1" prefix="u.admins" title_preset="" grid="Admins" />
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -N -r10005 -r11143
--- branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 10005)
+++ branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 11143)
@@ -1,7 +1,7 @@
 <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="proj-base:admins" pagination="0" prefix="u" title_preset="root_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:admins" pagination="0" prefix="u" title_preset="root_edit"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r10966 -r11143
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 10966)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 11143)
@@ -1490,6 +1490,33 @@
 			/* @var $file_helper FileHelper */
 
 			$file_helper->createItemFiles($event->Prefix, true); // create image fields
+
+			if ($this->Application->IsAdmin()) {
+				// 4. when in administrative console, then create all users with Active status
+				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+//				$fields['Password']['required'] = 1; // set password required (will broke approve/decline buttons)
+				$fields['Status']['default'] = STATUS_ACTIVE;
+				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+
+				// 5. remove groups tab on editing forms when AdvancedUserManagement config variable not set
+				if (!$this->Application->ConfigValue('AdvancedUserManagement')) {
+					$edit_tab_presets = $this->Application->getUnitOption($event->Prefix, 'EditTabPresets');
+
+					foreach ($edit_tab_presets as $preset_name => $preset_tabs) {
+						if (array_key_exists('groups', $preset_tabs)) {
+							unset($edit_tab_presets[$preset_name]['groups']);
+
+							if (count($edit_tab_presets[$preset_name]) == 1) {
+								// only 1 tab left -> remove it too
+								$edit_tab_presets[$preset_name] = Array ();
+							}
+						}
+					}
+
+					$this->Application->setUnitOption($event->Prefix, 'EditTabPresets', $edit_tab_presets);
+				}
+			}
+
 		}
 
 		/**
Index: branches/RC/kernel/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -N -r11140 -r11143
--- branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11140)
+++ branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11143)
@@ -83,13 +83,17 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="grid_membership_td" format="" no_special="" nl2br="" first_chars="" td_style="">
+<inp2:m_DefineElement name="grid_membership_platform_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_DefineElement name="grid_membership_td" td_style="">
 	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
-		<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_RenderElement name="grid_membership_platform_td" pass_params="1"/>
 	</td>
 </inp2:m_DefineElement>