diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 102c425ee2..b395244a78 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -88,8 +88,6 @@ class admin_ui
 				'title' => $data['account_description'],
 			);
 		}
-		$sel_options['account_primary_group'] = $sel_options['filter'];
-		unset($sel_options['account_primary_group']['']);
 
 		$sel_options['filter2'] = array(
 			''            => 'All',
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 5dcb4390a8..cb1c196642 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -42,9 +42,7 @@
 					<description id="${row}[account_firstname]" no_lang="1"/>
 					<description id="${row}[account_lastname]" no_lang="1"/>
 					<url-email id="${row}[account_email]" readonly="true" class="adminOverflowEllipsis"/>
-					<menulist>
-						<menupopup id="${row}[account_primary_group]" no_lang="1" readonly="true"/>
-					</menulist>
+					<select-account id="${row}[account_primary_group]" no_lang="1" readonly="true"/>
 					<description id="${row}[status]" no_lang="1" class="adminStatus"/>
 					<date-time id="${row}[account_created]" readonly="true"/>
 					<date-time id="${row}[account_modified]" readonly="true"/>