diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php
index 0d2613265d..4b8e2f3a89 100644
--- a/phpgwapi/inc/class.accounts.inc.php
+++ b/phpgwapi/inc/class.accounts.inc.php
@@ -231,7 +231,8 @@ class accounts
 	 * Searches / lists accounts: users and/or groups
 	 *
 	 * @param array with the following keys:
-	 * @param $param['type'] string/int 'accounts', 'groups', 'owngroups' (groups the user is a member of), 'both'
+	 * @param $param['type'] string/int 'accounts', 'groups', 'owngroups' (groups the user is a member of), 'both',
+	 * 	'groupmembers' (members of groups the user is a member of), 'groupmembers+memberships' (incl. memberships too)
 	 *	or integer group-id for a list of members of that group
 	 * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set
 	 * @param $param['order'] string column to sort after, default account_lid if unset
@@ -249,7 +250,7 @@ class accounts
 	 */
 	function search($param)
 	{
-		//echo "<p>accounts::search(".print_r($param,True).") start: ".microtime()."</p>\n";
+		//error_log(__METHOD__.'('.array2string($param).')');
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
 		$serial = serialize($param);
@@ -261,7 +262,7 @@ class accounts
 		// no backend understands $param['app'] and sql does not understand group-parameters
 		// --> do an full search first and then filter and limit that search
 		elseif($param['app'] || $this->config['account_repository'] != 'ldap' &&
-			(is_numeric($param['type']) || $param['type'] == 'owngroups'))
+			(is_numeric($param['type']) || in_array($param['type'],array('owngroups','groupmembers','groupmembers+memberships'))))
 		{
 			$app = $param['app'];
 			unset($param['app']);
@@ -270,14 +271,24 @@ class accounts
 
 			if ($this->config['account_repository'] != 'ldap' && is_numeric($param['type']))
 			{
-				$group = (int) $param['type'];
+				$members = $this->members($group,true);
 				$param['type'] = 'accounts';
 			}
 			elseif ($param['type'] == 'owngroups')
 			{
-				$group = true;
+				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
 				$param['type'] = 'groups';
 			}
+			elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
+			{
+				$members = array();
+				foreach($this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
+				{
+					$members = array_unique(array_merge($members,$this->members($grp,true)));
+					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
+				}
+				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
+			}
 			// call ourself recursive to get (evtl. cached) full search
 			$full_search = $this->search($param);
 
@@ -288,9 +299,9 @@ class accounts
 				// we want the result merged, whatever it takes, as we only care for the ids
 				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type']);
 			}
-			if ($group)
+			if (isset($members))
 			{
-				$members = is_int($group) ? $this->members($group,true) : $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				//error_log(__METHOD__.'() members='.array2string($members));
 				if (!$members) $members = array();
 				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
 			}
@@ -352,11 +363,27 @@ class accounts
 		{
 			$options['filter'] = (array)$options['filter'];
 		}
+		switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
+		{
+			case 'firstname':
+			case 'firstall':
+				$order = 'account_firstname,account_lastname';
+				break;
+			case 'lastname':
+			case 'lastall':
+				$order = 'account_lastname,account_firstname';
+				break;
+			default:
+				$order = 'account_lid';
+				break;
+		}
 		$accounts = array();
 		foreach(self::getInstance()->search(array(
-			'type' => 'both',
+			'type' => $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
+				!isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'groupmembers+memberships' : 'both',
 			'query' => $pattern,
 			'query_type' => 'all',
+			'order' => $order,
 		)) as $account)
 		{
 			$accounts[$account['account_id']] = common::display_fullname($account['account_lid'],
diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 535ee86796..f9b41245db 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -185,6 +185,12 @@ class egw_link extends solink
 				}
 			}
 		}
+		// disable ability to link to accounts for non-admins, if account-selection is disabled
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
+			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
+		{
+			unset(self::$app_register['home-accounts']);
+		}
 		if (!(self::$title_cache = $GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi')))
 		{
 			self::$title_cache = array();