Index: branches/RC/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -r11131 -r11190
--- branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11131)
+++ branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11190)
@@ -55,20 +55,22 @@
 
 <inp2:g-perm_LoadPermissions/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
+<div id="scroll_container">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
-	<tr class="subsectiontitle">
-		<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>
-</table>
+		<tr class="subsectiontitle">
+			<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>
+	</table>
+</div>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r11131 -r11190
--- branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11131)
+++ branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11190)
@@ -102,23 +102,23 @@
 </inp2:m_DefineElement>
 
 <inp2:g-perm_LoadPermissions/>
+<div id="scroll_container">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
+		<tr class="subsectiontitle">
+			<td><inp2:m_phrase label="la_col_PermissionName"/></td>
+			<td><inp2:m_phrase label="la_col_PermView"/></td>
+			<td><inp2:m_phrase label="la_col_PermAdd"/></td>
+			<td><inp2:m_phrase label="la_col_PermEdit"/></td>
+			<td><inp2:m_phrase label="la_col_PermDelete"/></td>
+			<td><inp2:m_phrase label="la_col_AdditionalPermissions"/></td>
+		</tr>
 
-	<tr class="subsectiontitle">
-		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
-		<td><inp2:m_phrase label="la_col_PermView"/></td>
-		<td><inp2:m_phrase label="la_col_PermAdd"/></td>
-		<td><inp2:m_phrase label="la_col_PermEdit"/></td>
-		<td><inp2:m_phrase label="la_col_PermDelete"/></td>
-		<td><inp2:m_phrase label="la_col_AdditionalPermissions"/></td>
-	</tr>
+		<inp2:adm_DrawTree render_as="tree_element" section_name="in-portal:root"/>
+	</table>
+</div>
 
-	<inp2:adm_DrawTree render_as="tree_element" section_name="in-portal:root"/>
-</table>
-
-
 <script type="text/javascript">
 	function update_perm_checkboxes($source_perm)
 	{