diff --git a/lib/user.php b/lib/user.php
index 97ec0c10504744beb1db8ea191d0738346337144..c14ef2d6ca643bf6c4bf365faa225410e15d343a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -350,7 +350,7 @@ class OC_User {
 				}
 			}
 		}
-		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 	}
 
 	/**
diff --git a/lib/user/database.php b/lib/user/database.php
index 12cd804641bf8e91374a04617eeee5e50f8cc752..a4cffe5d0c10e1ab7012e1d77e8bf177b9cc5139 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -183,7 +183,7 @@ class OC_User_Database extends OC_User_Backend {
 	*/
 	public function getHome($uid){
 		if($this->userExists($uid)){
-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
 		}
diff --git a/lib/user/http.php b/lib/user/http.php
index 87f3347a2363ad9401fb5be063fa200a4b532b61..547c0201b699877a1a725c47afa423afeb0ad458 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -98,7 +98,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	*/
 	public function getHome($uid){
 		if($this->userExists($uid)){
-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
 		}