diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index ae9b49b9c8..d1e9b625ba 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -126,15 +126,12 @@
        
       if (gettype($id) == "string") { $id = $this->name2id($id); }
       $groups = Array();
-      $group_memberships = $phpgw->acl->get_location_list_for_id("phpgw_group", 1, "u", intval($id));
-      if ($group_memberships) {
-        for ($idx=0; $idx<count($group_memberships); $idx++){
-          $groups[intval($group_memberships[$idx])] = 1;
-        }
-        return $groups;
-      } else {
-        return False;
+      $group_memberships = $phpgw->acl->get_location_list_for_id("phpgw_group", 1, intval($id));
+      if (!$group_memberships) { return False; }
+      for ($idx=0; $idx<count($group_memberships); $idx++){
+        $groups[intval($group_memberships[$idx])] = 1;
       }
+      return $groups;
     }
 
     function read_group_names($lid = "")
diff --git a/phpgwapi/inc/class.accounts_shared.inc.php b/phpgwapi/inc/class.accounts_shared.inc.php
index 671e7138bb..7ecd8435fc 100644
--- a/phpgwapi/inc/class.accounts_shared.inc.php
+++ b/phpgwapi/inc/class.accounts_shared.inc.php
@@ -67,18 +67,15 @@
     function sql_search($table,$owner=0)
     {
       global $phpgw_info;
-      global $phpgw;
+
       $s = "";
-// Changed By: Skeeter  29 Nov 00
-// This is to allow the user to search for other individuals group info....
       if(!$owner) {
         $owner = $phpgw_info["user"]["account_id"];
       }
-      $groups = $this->read_groups($owner);
+      $groups = $this->read_groups(intval($owner));
       if (gettype($groups) == "array") {
-//         echo "\n\n\n\n\ntest: " . count($groups) . "\n\n\n\n\n\n";
          while ($group = each($groups)) {
-           $s .= " or $table like '%," . $group[1] . ",%'";
+           $s .= " or $table like '%," . $group[0] . ",%'";
         }
       }
       return $s;
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 458d8d7fc8..5082cdb11b 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -98,14 +98,11 @@
       if (gettype($id) == "string") { $id = $this->name2id($id); }
       $groups = Array();
       $group_memberships = $phpgw->acl->get_location_list_for_id("phpgw_group", 1, intval($id));
-      if ($group_memberships) {
-        for ($idx=0; $idx<count($group_memberships); $idx++){
-          $groups[$group_memberships[$idx]] = 1;
-        }
-        return $groups;
-      } else {
-        return False;
+      if (!$group_memberships) { return False; }
+      for ($idx=0; $idx<count($group_memberships); $idx++){
+        $groups[$group_memberships[$idx]] = 1;
       }
+      return $groups;
     }
 
     function read_group_names($lid = ""){