diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php
index f7127bce8d..28d7b2b43e 100644
--- a/calendar/inc/class.calendar_activesync.inc.php
+++ b/calendar/inc/class.calendar_activesync.inc.php
@@ -1576,7 +1576,7 @@ END:VTIMEZONE
 	function settings($hook_data)
 	{
 		$cals = array();
-		if (!$hook_data['setup'] && is_numeric($hook_data['account_id']))
+		if (!$hook_data['setup'] && in_array($hook_data['type'], array('user', 'group')))
 		{
 			foreach (calendar_bo::list_calendars($hook_data['account_id']) as $entry)
 			{