Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -N -r6669 -r6696
--- trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 6669)
+++ trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 6696)
@@ -83,68 +83,6 @@
 
 					'PermSection'		=>	Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'),
 
-					'Sections'			=>	Array(
-													'in-portal:users'		=>	Array(
-																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'in-portal:community',
-																						'label'			=>	'la_tab_Community',
-																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
-																						'permissions'	=>	Array('view'),
-																						'priority'		=>	2,
-																						'type'			=>	stTREE,
-																				),
-
-													'in-portal:user_list'	=>	Array(
-																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'in-portal:users',
-																						'label'			=>	'la_tab_User_List',
-																						'url'			=>	Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
-																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
-																						'priority'		=>	1,
-																						'type'			=>	stTREE,
-																				),
-
-													'in-portal:configure_users'	=>	Array(
-																							'parent'		=>	'in-portal:users',
-																							'icon'			=>	'in-portal:users_settings',
-																							'label'			=>	'la_tab_ConfigSettings',
-																							'url'			=>	Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
-																							'permissions'	=>	Array('view', 'edit'),
-																							'priority'		=>	3,
-																							'type'			=>	stTREE,
-																					),
-
-													'in-portal:user_email'	=>	Array(
-																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'in-portal:settings_email',
-																						'label'			=>	'la_tab_ConfigE-mail',
-																						'url'			=>	Array('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
-																						'permissions'	=>	Array('view', 'edit'),
-																						'priority'		=>	4,
-																						'type'			=>	stTREE,
-																				),
-
-													'in-portal:user_custom'	=>	Array(
-																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'in-portal:settings_custom',
-																						'label'			=>	'la_tab_ConfigCustom',
-																						'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 6, 'pass_section' => true, 'pass' => 'm,cf'),
-																						'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-																						'priority'		=>	5,
-																						'type'			=>	stTREE,
-																				),
-
-													'in-portal:user_banlist'	=>	Array(
-																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'in-portal:banlist',
-																						'label'			=>	'la_tab_BanList',
-																						'url'			=>	Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'),
-																						'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-																						'priority'		=>	6,
-																						'type'			=>	stTREE,
-																				),
-											),
-
 					'TableName'			=>	TABLE_PREFIX.'PortalUser',
 
 					'ListSQLs'			=>	Array(	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
Index: trunk/core/units/groups/groups_config.php
===================================================================
diff -u -N -r6669 -r6696
--- trunk/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 6669)
+++ trunk/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 6696)
@@ -44,18 +44,6 @@
 
 					'PermSection'		=>	Array('main' => 'in-portal:user_groups'),
 
-					'Sections'			=>	Array(
-													'in-portal:user_groups'	=>	Array(
-																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'in-portal:usergroups',
-																						'label'			=>	'la_tab_User_Groups',
-																						'url'			=>	Array('t' => 'groups/groups_list', 'pass' => 'm'),
-																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
-																						'priority'		=>	2,
-																						'type'			=>	stTREE,
-																				),
-											),
-
 					'TableName'			=>	TABLE_PREFIX.'PortalGroup',
 
 					'ListSQLs'			=>	Array(
Index: trunk/core/units/general/helpers/sections_helper.php
===================================================================
diff -u -N -r6625 -r6696
--- trunk/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 6625)
+++ trunk/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 6696)
@@ -57,7 +57,16 @@
 
 				foreach ($sections as $section_name => $section_params) {
 					// we could also skip not allowed sections here in future
-					$section_params['SectionPrefix'] = $prefix;
+					if ( isset($section_params['SectionPrefix']) ) {
+						$section_prefix = $section_params['SectionPrefix'];
+					}
+					elseif ( $this->Application->getUnitOption($prefix, 'SectionPrefix') ) {
+						$section_prefix = $this->Application->getUnitOption($prefix, 'SectionPrefix');
+					}
+					else {
+						$section_prefix = $prefix;
+					}
+					$section_params['SectionPrefix'] = $section_prefix;
 					$section_params['url']['m_opener'] = 'r';
 					$section_params['url']['no_pass_through'] = 1;
 					$pass_section = getArrayValue($section_params, 'url', 'pass_section');