Index: trunk/admin/users/user_list.php
===================================================================
diff -u -r402 -r603
--- trunk/admin/users/user_list.php	(.../user_list.php)	(revision 402)
+++ trunk/admin/users/user_list.php	(.../user_list.php)	(revision 603)
@@ -220,7 +220,7 @@
 $order = $objConfig->Get($SortOrderVar);
 $SearchWords = $objSession->GetVariable("UserSearchWord");
 
-$where = "(ug.PrimaryGroup!=0 OR ug.PrimaryGroup IS NULL)";
+$where = '1';
 
 $SearchWhere = $SearchWords ? $objUsers->AdminSearchWhereClause($SearchWords) : '';
 if(strlen($SearchWhere))
@@ -236,7 +236,7 @@
 
 $sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
 $sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y %H:%i:%s') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
-$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) ";
+$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
 $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE $where";
 
 if(!strlen($objConfig->Get($SortFieldVar)))