diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index ee68039162..99f696e3a0 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -31,13 +31,18 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 * @return bool
 	 */
 	protected function validateUserPass($username, $password){
-		OC_Util::setUpFS();//login hooks may need early access to the filesystem
-		if(OC_User::login($username,$password)){
-			OC_Util::setUpFS($username);
+		if (OC_User::isLoggedIn()) {
+			OC_Util::setupFS($username);
 			return true;
-		}
-		else{
-			return false;
+		} else {
+			OC_Util::setUpFS();//login hooks may need early access to the filesystem
+			if(OC_User::login($username,$password)){
+				OC_Util::setUpFS($username);
+				return true;
+			}
+			else{
+				return false;
+			}
 		}
 	}
 }