diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 321871ac41..682fdacf54 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -355,6 +355,7 @@ class admin_ui
 	{
 		$groups = $GLOBALS['egw']->accounts->search(array(
 				'type'  => 'groups',
+				'query' => $query['search'],
 				'order' => $query['order'],
 				'sort'  => $query['sort'],
 				'start' => (int)$query['start'],
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 4c6efb3d75..f567b5b270 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -53,7 +53,6 @@
 				<column width="15%"/>
 				<column width="25%"/>
 				<column width="25%"/>
-				<column width="120"/>
 			</columns>
 			<rows>
 				<row>
@@ -61,13 +60,9 @@
 						<nextmatch-sortheader label="Group name" id="account_lid"/>
 						<nextmatch-sortheader label="Description" id="account_description"/>
 					</vbox>
-					<nextmatch-sortheader label="EMail" id="account_email"/>
-					<nextmatch-sortheader label="Members" id="account_members"/>
-					<nextmatch-sortheader label="Applications" id="apps"/>
-					<vbox>
-						<nextmatch-sortheader label="Created" id="account_created"/>
-						<nextmatch-sortheader label="Modified" id="account_modified"/>
-					</vbox>
+					<nextmatch-sortheader label="EMail" id="email"/>
+					<nextmatch-header label="Members" id="account_members"/>
+					<nextmatch-header label="Applications" id="apps"/>
 				</row>
 				<row class="$row_cont[status_class]">
 					<vbox>
@@ -77,10 +72,6 @@
 					<url-email id="${row}[account_email]" readonly="true" no_lang="1" class="adminOverflowEllipsis"/>
 					<select-account id="${row}[members]" no_lang="1" readonly="true"/>
 					<select-app id="${row}[apps]" tags="true" readonly="true"/>
-					<vbox>
-						<date id="${row}[account_created]" readonly="true"/>
-						<date id="${row}[account_modified]" readonly="true"/>
-					</vbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/api/src/Accounts/Sql.php b/api/src/Accounts/Sql.php
index 218ae7f31b..43b5a3e456 100644
--- a/api/src/Accounts/Sql.php
+++ b/api/src/Accounts/Sql.php
@@ -412,7 +412,8 @@ class Sql
 				Api\Accounts::format_username('account_lid','account_firstname','account_lastname'))), $param['order']);
 		}
 		$order = str_replace(array_keys($order2contact),array_values($order2contact),$param['order']);
-		// allways add 'account_lid', as it is only valid one for groups
+
+		// allways add 'account_lid'
 		if (strpos($order, 'account_lid') === false)
 		{
 			$order .= ($order?',':'').'account_lid';