diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index c67d895c60..84bad4cb81 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -120,12 +120,12 @@ class calendar_hooks
 	 */
 	static function admin()
 	{
-		$file = Array(
-			'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-			'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
-			'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
-			'Category ACL' => Egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'),
-			'Update timezones' => Egw::link('/index.php','menuaction=calendar.calendar_timezones.update'),
+		$file = array(
+			'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+			'Custom fields'      => Egw::link('/index.php', 'menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
+			'Global Categories'  => Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
+			'Category ACL'       => Egw::link('/index.php', 'menuaction=calendar.calendar_uiforms.cat_acl&appname=calendar&ajax=true'),
+			'Update timezones'   => Egw::link('/index.php', 'menuaction=calendar.calendar_timezones.update'),
 		);
 		display_section('calendar','calendar',$file);
 	}
diff --git a/calendar/templates/default/cat_acl.xet b/calendar/templates/default/cat_acl.xet
index 3087fda76f..b91903a5d2 100644
--- a/calendar/templates/default/cat_acl.xet
+++ b/calendar/templates/default/cat_acl.xet
@@ -6,23 +6,25 @@
 			<caption label="Category ACL"/>
 			<et2-description  value="Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!"></et2-description>
 		</groupbox>
-		<grid>
-			<columns>
-				<column/>
-				<column/>
-				<column/>
-			</columns>
-			<rows>
-				<row class="th">
-					<et2-description  value="Category"></et2-description>
-					<et2-description  value="Restrict add category to"></et2-description>
-					<et2-description  value="Restrict set status to"></et2-description>
-				</row>
-				<row class="row" valign="top">
-					<et2-select-cat  id="${row}[cat_id]" emptyLabel="Select one"></et2-select-cat>
-					<et2-select-account  rows="5" id="${row}[add]" multiple="1" placeholder="both"></et2-select-account>
-					<et2-select-account  rows="5" id="${row}[status]" multiple="1" placeholder="both"></et2-select-account>
+		<grid width="100%">
+            <columns>
+                <column/>
+                <column/>
+                <column/>
+            </columns>
+            <rows>
+                <row class="th">
+                    <et2-description value="Category"></et2-description>
+                    <et2-description value="Restrict add category to"></et2-description>
+                    <et2-description value="Restrict set status to"></et2-description>
 				</row>
+                <row class="row" valign="top">
+                    <et2-select-cat id="${row}[cat_id]" emptyLabel="Select one"></et2-select-cat>
+                    <et2-select-account rows="5" id="${row}[add]" multiple="1" emptyLabel="Select user or group"
+                                        accountType="both"></et2-select-account>
+                    <et2-select-account rows="5" id="${row}[status]" multiple="1" emptyLabel="Select user or group"
+                                        accountType="both"></et2-select-account>
+                </row>
 			</rows>
 		</grid>
 		<et2-hbox>