diff --git a/filemanager/inc/class.bophpwebhosting.inc.php b/filemanager/inc/class.bophpwebhosting.inc.php
index bb3916ab33..8854966233 100755
--- a/filemanager/inc/class.bophpwebhosting.inc.php
+++ b/filemanager/inc/class.bophpwebhosting.inc.php
@@ -115,7 +115,7 @@
 			$this->userinfo['username'] = $GLOBALS['phpgw_info']['user']['account_id'];
 			$this->userinfo['account_lid'] = $GLOBALS['phpgw']->accounts->id2name($this->userinfo['username']);
 			$this->userinfo['hdspace'] = 10000000000;
-			$this->homedir = $this->fakebase.'/'.$this->userinfo['account_lid'];
+			$this->homedir = $this->fakebase.SEP.$this->userinfo['account_lid'];
 
 			if(!defined('NULL'))
 			{
diff --git a/filemanager/inc/class.uiphpwebhosting.inc.php b/filemanager/inc/class.uiphpwebhosting.inc.php
index d8620c371b..ed5a92033a 100755
--- a/filemanager/inc/class.uiphpwebhosting.inc.php
+++ b/filemanager/inc/class.uiphpwebhosting.inc.php
@@ -78,8 +78,8 @@
 
 			$p->set_var('error','<br><br>Go to your <a href="'.$GLOBALS['phpgw']->link('/index.php',
 					Array(
-						'menuaction'	=> 'phpwebhosting.uiphpwebhosting.index',
-						'path'	=> $this->bo->homedir
+						'menuaction'	=> $this->bo->appname.'.ui'.$this->bo->appname.'.index',
+						'path'	=> urlencode($this->bo->homedir)
 					)
 				).'">Home</a> directory'
 			);
@@ -147,7 +147,7 @@
 				$this->bo->path != $this->bo->fakebase &&
 				!$this->bo->vfs->file_exists($this->bo->path,Array(RELATIVE_NONE)))
 			{
-				$this->no_access_exists(lang('Directory '.$this->bo->path.' does not exist'));
+				$this->no_access_exists(lang('Directory X does not exist',$this->bo->path));
 			}
 		}