diff --git a/plugins/publiclink/getfile.php b/plugins/publiclink/getfile.php
index c579dc9246..15a568df3d 100644
--- a/plugins/publiclink/getfile.php
+++ b/plugins/publiclink/getfile.php
@@ -1,5 +1,6 @@
 <?php
 $RUNTIME_NOAPPS=true; //no need to load the apps
+$RUNTIME_NOSETUPFS=true; //don't setup the fs yet
 
 require_once '../../lib/base.php';
 
diff --git a/plugins/publiclink/lib_public.php b/plugins/publiclink/lib_public.php
index 494f84fdb7..7c25c938fd 100644
--- a/plugins/publiclink/lib_public.php
+++ b/plugins/publiclink/lib_public.php
@@ -38,11 +38,8 @@ class OC_PublicLink{
 			$path=$data[0]['path'];
 			$user=$data[0]['user'];
 			
-			//login
-			$_SESSION['user_id']=$user;
-			
 			//prepare the filesystem
-			OC_UTIL::setupFS();
+			OC_UTIL::setupFS($user);
 			
 			//get time mimetype and set the headers
 			$mimetype=OC_FILESYSTEM::getMimeType($path);