diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index 32497ad1fc..7515739e68 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -580,6 +580,7 @@
 					$url = $phpgw_info['server']['webserver_url'].'/'.$app.'/'.$url; 
 				}
 			} */
+			//echo "$url\n";
 			return $url;
 		}  
 	}
diff --git a/phpgwapi/inc/class.vfs.inc.php b/phpgwapi/inc/class.vfs.inc.php
index 9c7bb68b08..030b8af8ae 100644
--- a/phpgwapi/inc/class.vfs.inc.php
+++ b/phpgwapi/inc/class.vfs.inc.php
@@ -113,13 +113,13 @@
           }
           $list[] = array("name" => "home", "type"  => "dir", "subdirs" => $hassubdir);
 	        $hassubdir = False;
-          $groups = $phpgw->accounts->read_group_names();
-          if (!empty ($groups[0][1])) {
+          $groups = $phpgw->accounts->get_list('groups');
+          if (!empty ($groups[0]['account_lid'])) {
             $group_count = count($groups);
             for ($groupidx=0;$groupidx<$group_count;++$groupidx) {
-              $this->verifydir("group",$groups[$groupidx][1]);
+              $this->verifydir("group",$groups[$groupidx]['account_lid']);
               if ($checksubdirs == "Yes"){ //if its a dir, does that dir have subdirs?
-                $path = $phpgw_info["server"]["files_dir"].$sep."groups".$sep.$groups[$groupidx][1];
+                $path = $phpgw_info["server"]["files_dir"].$sep."groups".$sep.$groups[$groupidx]['account_lid'];
                 $subdir = dir($path);
                 while($subentry=$subdir->read()) {
                   $subpath = $path.$sep.$subentry;
@@ -129,7 +129,7 @@
                   }
                 }
               }
-              $list[] = array("name" => $groups[$groupidx][1], "type"  => "dir", "subdirs" => $hassubdir);
+              $list[] = array("name" => $groups[$groupidx]['account_lid'], "type"  => "dir", "subdirs" => $hassubdir);
 	            $hassubdir = False;
             }
           }