Index: branches/RC/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r11135 -r11172
--- branches/RC/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 11135)
+++ branches/RC/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 11172)
@@ -1137,7 +1137,7 @@
 	{
 		parent::OnAfterConfigRead($event);
 
-		if (!$this->Application->ConfigValue('AdvancedUserManagement')) {
+		if ((!$this->Application->ConfigValue('AdvancedUserManagement') && $this->Application->isModuleEnabled('Proj-Base')) || (!$this->Application->ConfigValue('AdvancedUserManagementInportal') && !$this->Application->isModuleEnabled('Proj-Base'))) {
 			$section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments');
 			if (!$section_ajustments) {
 				$section_ajustments = Array ();
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r11168 -r11172
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11168)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11172)
@@ -1089,5 +1089,9 @@
 INSERT INTO Counters VALUES (DEFAULT, 'guests_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession WHERE PortalUserId <= 0', NULL , NULL , '3600', '0', '|UserSession|');
 INSERT INTO Counters VALUES (DEFAULT, 'users_online', 'SELECT COUNT(*) FROM <%PREFIX%>UserSession', NULL , NULL , '3600', '0', '|UserSession|');
 
+
+INSERT INTO ConfigurationAdmin VALUES ('AdvancedUserManagementInportal', 'la_Text_General', 'la_prompt_AdvancedUserManagementInportal', 'checkbox', NULL, NULL, '10.011', 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdvancedUserManagementInportal', 0, 'In-Portal:Users', 'in-portal:configure_users');
+
 INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
 INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', '4.3.9', 1, 0, '', 0, '0');
\ No newline at end of file
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r11143 -r11172
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 11143)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 11172)
@@ -1499,7 +1499,7 @@
 				$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')) {
+				if ((!$this->Application->ConfigValue('AdvancedUserManagement') && $this->Application->isModuleEnabled('Proj-Base')) || (!$this->Application->ConfigValue('AdvancedUserManagementInportal') && !$this->Application->isModuleEnabled('Proj-Base'))) {
 					$edit_tab_presets = $this->Application->getUnitOption($event->Prefix, 'EditTabPresets');
 
 					foreach ($edit_tab_presets as $preset_name => $preset_tabs) {