diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index 2341735da..615415349 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -556,13 +556,7 @@ public class User extends UserBase implements IUser
 		{
 			// Ignore
 		}
-	}
-
-	@Override
-	public List<String> getHomes()
-	{
-		return super.getHomes();
-	}
+	}	
 
 	@Override
 	public int compareTo(final IUser t)
@@ -772,9 +766,5 @@ public class User extends UserBase implements IUser
 		this.setVanished(set);
 	}
 
-	@Override
-	public Location getHome(String name) throws Exception
-	{
-		return super.getHome(name);
-	}
+	
 }
diff --git a/Essentials/src/net/ess3/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java
index 70c7e6ed2..18bede37c 100644
--- a/Essentials/src/net/ess3/user/UserBase.java
+++ b/Essentials/src/net/ess3/user/UserBase.java
@@ -417,7 +417,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
 			}
 			try
 			{
-				return getData().getHomes().get(Util.sanitizeFileName(name)).getBukkitLocation();
+				return getData().getHomes().get(Util.sanitizeKey(name)).getBukkitLocation();
 			}
 			catch (WorldNotLoadedException ex)
 			{