diff --git a/lib/private/user.php b/lib/private/user.php
index 641a329b0dd9..e02a0aaa1fcb 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -234,7 +234,7 @@ public static function login($uid, $password) {
 		session_regenerate_id(true);
 		$result = self::getUserSession()->login($uid, $password);
 		if ($result) {
-			OC_Util::setupFS($uid);
+			OC_Util::setupFS(self::getUserSession()->getUser()->getUID());
 		}
 		return $result;
 	}