Index: admin_templates/groups/groups_edit.tpl
===================================================================
--- admin_templates/groups/groups_edit.tpl	(revision 13756)
+++ admin_templates/groups/groups_edit.tpl	(working copy)
@@ -53,18 +53,44 @@
 <inp2:g_SaveWarning name="grid_save_warning"/>
 <inp2:g_ErrorWarning name="form_error_warning"/>
 
+<inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<td class="label-cell">
+			<inp2:m_phrase name="$label"/>:
+
+			<inp2:m_if check="m_IsDebugMode">
+				<br/><small style="color: gray;"><inp2:m_param name="perm_name"/></small>
+			</inp2:m_if>
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:{$prefix}_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
+			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));">
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:g-perm_LoadPermissions/>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="g" fields="GroupId,Name,FrontRegistration,Description,Enabled" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="g" field="GroupId" title="!la_fld_GroupId!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="g" field="Name" title="!la_fld_GroupName!"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="g" field="FrontRegistration" title="la_fld_FrontRegistration"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="!la_fld_Comments!" control_options="{max_height: 200}" rows="5" cols="30"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="!la_fld_Comments!" control_options="{max_height: 100}"/>
 
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!"/>
 			</inp2:m_if>
 
+			<inp2:m_if check="m_CheckPermission" permissions="in-portal:user_groups.advanced:manage_permissions" system="1">
+				<inp2:m_RenderElement name="subsection" title="la_section_BasicPermissions"/>
+					<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="LOGIN" label="la_PermName_Login_desc"/>
+					<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="ADMIN" label="la_PermName_Admin_desc"/>
+					<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="SYSTEM_ACCESS.READONLY" label="la_PermName_SystemAccess.ReadOnly_desc"/>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: admin_templates/groups/permissions_selector.tpl
===================================================================
--- admin_templates/groups/permissions_selector.tpl	(revision 13756)
+++ admin_templates/groups/permissions_selector.tpl	(working copy)
@@ -45,23 +45,6 @@
 	</tr>
 </inp2:m_DefineElement>
 
-
-<inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td>
-			<inp2:m_phrase name="$label"/>
-
-			<inp2:m_if check="m_IsDebugMode">
-				<br/><small style="color: gray;"><inp2:m_param name="perm_name"/></small>
-			</inp2:m_if>
-		</td>
-		<td>
-	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:{$prefix}_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
-			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));">
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
 <inp2:g-perm_LoadPermissions/>
 
 <div id="scroll_container">
@@ -72,13 +55,8 @@
 			<td><inp2:m_phrase label="la_col_PermissionName"/></td>
 			<td><inp2:m_phrase label="la_col_PermissionValue"/></td>
 		</tr>
-		<inp2:m_if check="m_GetEquals" name="section_name" value="in-portal:root">
-			<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="LOGIN" label="lu_PermName_Login_desc"/>
-			<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="ADMIN" label="lu_PermName_Admin_desc"/>
-			<inp2:m_RenderElement name="old_permission_element" section_name="in-portal:root" perm_name="SYSTEM_ACCESS.READONLY" label="la_PermName_SystemAccess.ReadOnly_desc"/>
-		<inp2:m_else/>
-			<inp2:adm_ListSectionPermissions render_as="permission_element" type="1"/>
-		</inp2:m_if>
+
+		<inp2:adm_ListSectionPermissions render_as="permission_element" type="1"/>
 	</table>
 </div>
 
Index: units/admin/admin_config.php
===================================================================
--- units/admin/admin_config.php	(revision 13756)
+++ units/admin/admin_config.php	(working copy)
@@ -57,7 +57,7 @@
 				'icon'			=>	'site',
 				'label'			=>	$this->Application->ConfigValue('Site_Name'),
 				'url'			=>	Array ('t' => 'index', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
-				'permissions'	=>	Array ('advanced:admin_login', 'advanced:front_login'),
+				'permissions'	=>	Array (),
 				'priority'		=>	0,
 				'container'		=>	true,
 				'type'			=>	stTREE,