diff --git a/api/src/Accounts.php b/api/src/Accounts.php
index 6710c5d0e4..ec3ac52aa0 100644
--- a/api/src/Accounts.php
+++ b/api/src/Accounts.php
@@ -199,7 +199,9 @@ class Accounts
 
 		// Check for lang(Group) in search - if there, we search all groups
 		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
-		if($group_index !== FALSE)
+		if($group_index !== FALSE && !(
+				in_array($param['type'], array('accounts', 'groupmembers')) || is_int($param['type'])
+		))
 		{
 			// do not return any groups for account-selection == "none"
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'none' &&