diff --git a/lib/filesystem.php b/lib/filesystem.php
index 8b44ab6e6c..00682573dd 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -254,14 +254,17 @@ class OC_Filesystem{
 		}		
 	}
 	
-	static public function init($root) {
+	static public function init($root, $user = '') {
 		if(self::$defaultInstance) {
 			return false;
 		}
 		self::$defaultInstance=new OC_FilesystemView($root);
 
 		//load custom mount config
-		self::loadSystemMountPoints(OC_User::getUser());
+		if (!isset($user)) {
+			$user = OC_User::getUser();
+		}
+		self::loadSystemMountPoints($user);
 
 		self::$loaded=true;
 	}
diff --git a/lib/util.php b/lib/util.php
index eb0e5e8ec4..a847c02872 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -47,7 +47,7 @@ class OC_Util {
 			}
 			//jail the user into his "home" directory
 			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => $user_root), $user);
-			OC_Filesystem::init($user_dir);
+			OC_Filesystem::init($user_dir, $user);
 			$quotaProxy=new OC_FileProxy_Quota();
 			$fileOperationProxy = new OC_FileProxy_FileOperations();
 			OC_FileProxy::register($quotaProxy);