diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php
index b42fa63504..4e5bb66184 100644
--- a/phpgwapi/inc/class.accounts.inc.php
+++ b/phpgwapi/inc/class.accounts.inc.php
@@ -390,11 +390,13 @@ class accounts
 				$type = $only_own ? 'groupmembers' : 'accounts';
 				break;
 			case 'groups':
-				$type = $only_own ? 'memberships' : 'groups';
+				$type = $only_own ? 'owngroups' : 'groups';
+				break;
+			case 'memberships':
+				$type = 'owngroups';
 				break;
 			case 'owngroups':
 			case 'groupmembers':
-			case 'memberships':
 				$type = $options['account_type'];
 				break;
 			case 'both':
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 86b5d258df..34601a2d68 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -447,9 +447,9 @@ class accounts_sql
 			case 'groupmembers':
 			case 'groupmembers+memberships':
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
+				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true)));
+					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
 				}
 				$filter['account_id'] = $members;
diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 5b4ab52c32..ab941bcc71 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -1097,7 +1097,7 @@ class egw_session
 	 */
 	public static function link($url, $extravars = '')
 	{
-		//echo '<p>'.__METHOD__."(url='$url',extravars='".array2string($extravars)."')";
+		//error_log(_METHOD__."(url='$url',extravars='".array2string($extravars)."')");
 
 		if ($url[0] != '/')
 		{