diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 527cec0afe..a3a8750d27 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -30,6 +30,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
+		OC_Util::setupFS4all();
 	}
 
 	/**
diff --git a/lib/util.php b/lib/util.php
index f34831c12c..3b2f476ada 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -42,9 +42,6 @@ class OC_Util {
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
 			
 			//jail the user into his "home" directory
-			foreach(OC_User::getUsers() as $singleuser){
-				OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $singleuser);
-			}
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
@@ -62,6 +59,12 @@ class OC_Util {
 		}
 	}
 
+	public static function setupFS4all(){
+		foreach(OC_User::getUsers() as $user){
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $user);
+		}	
+	}
+	
 	public static function tearDownFS(){
 		OC_Filesystem::tearDown();
 		self::$fsSetup=false;