diff --git a/calendar/inc/class.uical.inc.php b/calendar/inc/class.uical.inc.php
index 4b78df4de3..2572031314 100644
--- a/calendar/inc/class.uical.inc.php
+++ b/calendar/inc/class.uical.inc.php
@@ -36,9 +36,41 @@ class uical
 	 */
 	var $debug=false;
 	/**
-	 * @var $bo class bocal
+	 * instance of the bocal or bocalupdate class
+	 * 
+	 * @var bocalupdate
 	 */
-	var $bo,$jscal,$html,$datetime,$cats,$accountsel;
+	var $bo;
+	/**
+	 * instance of jscalendar
+	 *
+	 * @var jscalendar
+	 */
+	var $jscal;
+	/**
+	 * Reference to global html class
+	 *
+	 * @var html
+	 */
+	var $html;
+	/**
+	 * Reference to global datetime class
+	 *
+	 * @var datetime
+	 */
+	var $datetime;
+	/**
+	 * Reference to global categories class
+	 *
+	 * @var categories
+	 */
+	var $cats;
+	/**
+	 * Reference to global uiaccountsel class
+	 *
+	 * @var uiaccountsel
+	 */
+	var $accountsel;
 	/**
 	 * @var array $common_prefs reference to $GLOBALS['egw_info']['user']['preferences']['common']
 	 */
@@ -621,8 +653,7 @@ class uical
 		}
 */
 		// Calendarselection: User or Group
-		if(count($this->bo->grants) > 0 && (!isset($GLOBALS['egw_info']['server']['deny_user_grants_access']) ||
-			!$GLOBALS['egw_info']['server']['deny_user_grants_access']))
+		if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')
 		{
 			$grants = array();
 			foreach($this->bo->list_cals() as $grant)
diff --git a/calendar/inc/class.uiforms.inc.php b/calendar/inc/class.uiforms.inc.php
index bc2e61b904..f55bfcecfb 100644
--- a/calendar/inc/class.uiforms.inc.php
+++ b/calendar/inc/class.uiforms.inc.php
@@ -40,6 +40,12 @@ class uiforms extends uical
 		'export' => true,
 		'import' => true,
 	);
+	/**
+	 * Reference to link-class of bocal
+	 *
+	 * @var bolink
+	 */
+	var $link;
 	
 	/**
 	 * Standard durations used in edit and freetime search
@@ -730,7 +736,8 @@ class uiforms extends uical
 		}
 		// disabling the custom fields tab, if there are none
 		$readonlys['general|description|participants|recurrence|custom|links|alarms'] = array(
-			'custom' => !count($this->bo->config['customfields'])
+			'custom' => !count($this->bo->config['customfields']),
+			'participants' => $this->accountsel->account_selection == 'none',
 		);
 		if ($view || !isset($GLOBALS['egw_info']['user']['apps']['felamimail']))
 		{