diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 2973240a4a15e..cd26337cd2041 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -548,11 +548,11 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
 			\OC::$server->getCsrfTokenManager()->refreshToken();
 		}
 
-		//we need to pass the user name, which may differ from login name
-		$user = $this->getUser()->getUID();
-		OC_Util::setupFS($user);
-
 		if ($firstTimeLogin) {
+			//we need to pass the user name, which may differ from login name
+			$user = $this->getUser()->getUID();
+			OC_Util::setupFS($user);
+
 			// TODO: lock necessary?
 			//trigger creation of user home and /files folder
 			$userFolder = \OC::$server->getUserFolder($user);