Index: trunk/kernel/admin/include/toolbar/userselect.php
===================================================================
diff -u -r85 -r718
--- trunk/kernel/admin/include/toolbar/userselect.php	(.../userselect.php)	(revision 85)
+++ trunk/kernel/admin/include/toolbar/userselect.php	(.../userselect.php)	(revision 718)
@@ -1,5 +1,5 @@
 <?php             
-global $pathtoroot, $envar, $rootURL,$imagesURL,$UserFilter, $adminURL;
+global $pathtoroot, $envar, $rootURL,$imagesURL,$UserFilter, $adminURL, $destform;
 
 $ViewNormal==1;
 if($objConfig->Get("User_ViewNormal")==0)
@@ -35,7 +35,8 @@
 
 $browseURL = $adminURL."/browse";
 
-$destform = isset( $_POST['destform'] ) ? $_POST['destform'] : $_GET['destform'];
+$destform = GetVar('destform',true); // isset( $_POST['destform'] ) ? $_POST['destform'] : $_GET['destform'];
+
 $destfield = $_GET["destfield"];
 $dosubmit=(int)$_REQUEST["dosubmit"];
 
Index: trunk/admin/users/user_select.php
===================================================================
diff -u -r534 -r718
--- trunk/admin/users/user_select.php	(.../user_select.php)	(revision 534)
+++ trunk/admin/users/user_select.php	(.../user_select.php)	(revision 718)
@@ -177,7 +177,7 @@
         $orderby = $field." ".$order;
         $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') 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 ";
         $sql .= "u.PortalUserId NOT IN (".$catlist.")";
         
@@ -190,8 +190,8 @@
       {      
           $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') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
-          $sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) ";
-          $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0";
+          $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 1";
           //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
           $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
           $itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
@@ -204,8 +204,8 @@
 {
     $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') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
-    $sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) ";
-    $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0 $where";
+    $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 1 $where";
     //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
     
     $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );