diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 7b86117676..5d56ad197e 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -337,7 +337,7 @@ class calendar_bo
 		foreach(array_keys($event['participants']) as $uid)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
-				($members = $GLOBALS['egw']->accounts->member($uid)))
+				($members = $GLOBALS['egw']->accounts->members($uid)))
 			{
 				foreach($members as $member)
 				{
@@ -392,7 +392,7 @@ class calendar_bo
 			{
 				if ($no_enum_groups) continue;
 
-				$members = $GLOBALS['egw']->accounts->member($user);
+				$members = $GLOBALS['egw']->accounts->members($user);
 				if (is_array($members))
 				{
 					foreach($members as $member)
@@ -408,7 +408,7 @@ class calendar_bo
 			}
 			else	// for users we have to include all the memberships, to get the group-events
 			{
-				$memberships = $GLOBALS['egw']->accounts->membership($user);
+				$memberships = $GLOBALS['egw']->accounts->memberships($user);
 				if (is_array($memberships))
 				{
 					foreach($memberships as $group)
@@ -1693,7 +1693,7 @@ class calendar_bo
 		{
 			self::_list_cals_add($id,$users,$groups);
 		}
-		if (($memberships = $GLOBALS['egw']->accounts->membership($user)))
+		if (($memberships = $GLOBALS['egw']->accounts->memberships($user)))
 		{
 			foreach($memberships as $group_info)
 			{
diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 8e0abcbee2..de33ca24c8 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -759,7 +759,7 @@ class calendar_boupdate extends calendar_bo
 		foreach($to_notify as $userid => $statusid)
 		{
 			if (is_numeric($userid) && $GLOBALS['egw']->accounts->get_type($userid) == 'g' &&
-				($members = $GLOBALS['egw']->accounts->member($userid)))
+				($members = $GLOBALS['egw']->accounts->members($userid)))
 			{
 				foreach($members as $member)
 				{
@@ -2084,7 +2084,7 @@ class calendar_boupdate extends calendar_bo
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				$members = $GLOBALS['egw']->accounts->member($user);
+				$members = $GLOBALS['egw']->accounts->members($user);
 				if (is_array($members))
 				{
 					foreach($members as $member)
@@ -2100,7 +2100,7 @@ class calendar_boupdate extends calendar_bo
 			}
 			else	// for users we have to include all the memberships, to get the group-events
 			{
-				$memberships = $GLOBALS['egw']->accounts->membership($user);
+				$memberships = $GLOBALS['egw']->accounts->memberships($user);
 				if (is_array($memberships))
 				{
 					foreach($memberships as $group)
diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 0ce4ae699c..f323a206f2 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -186,7 +186,7 @@ class calendar_ui
 			$owner = trim($owner);
 			if (is_numeric($owner) && $GLOBALS['egw']->accounts->get_type($owner) == 'g')
 			{
-				foreach($GLOBALS['egw']->accounts->member($owner) as $member)
+				foreach($GLOBALS['egw']->accounts->members($owner) as $member)
 				{
 					$member = $member['account_id'];
 					if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$member))
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 83355a9543..3f391e7004 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -583,7 +583,7 @@ class calendar_uiviews extends calendar_ui
 			}
 		}
 		$content = array('view' => array());
-		
+
 		if ($weeks)
 		{
 			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
@@ -612,7 +612,7 @@ class calendar_uiviews extends calendar_ui
 			$search_params = $this->search_params;
 			$search_params['start'] = $week_start->format('ts');
 			$search_params['end'] = $week_end->format('ts');
-			
+
 			$content['view'][] = (array)$this->tagWholeDayOnTop($this->bo->search($search_params)) +
 			array(
 				'id' => $week_start->format('Ymd')
@@ -625,7 +625,7 @@ class calendar_uiviews extends calendar_ui
 
 		// Get the actions
 		$home->setElementAttribute('view','actions',$this->get_actions());
-		
+
 		$home->exec(__METHOD__, $content);
 	}
 
@@ -2200,7 +2200,7 @@ class calendar_uiviews extends calendar_ui
 			}
 			elseif ($enum_groups && $GLOBALS['egw']->accounts->get_type($user) == 'g')	// groups
 			{
-				foreach((array) $GLOBALS['egw']->accounts->member($user) as $data)
+				foreach((array) $GLOBALS['egw']->accounts->members($user) as $data)
 				{
 					$user = $data['account_id'];
 					if ($this->bo->check_perms(EGW_ACL_READ | EGW_ACL_FREEBUSY,0,$user))