diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 373f201c3..8dc131ff8 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -610,11 +610,25 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		this.metrics = metrics;
 	}
 
+	@Deprecated
+	@Override
+	public User getUser(final Object base)
+	{
+		if (base instanceof Player)
+		{
+			return getUser((Player)base);
+		}
+		if (base instanceof String)
+		{
+			return getOfflineUser((String)base);
+		}
+		return null;
+	}
 
 	@Override
 	public User getUser(final String base)
-	{	
-		return getOfflineUser((String)base);		
+	{
+		return getOfflineUser((String)base);
 	}
 
 	@Override
diff --git a/Essentials/src/com/earth2me/essentials/IEssentials.java b/Essentials/src/com/earth2me/essentials/IEssentials.java
index 73b462939..f293dbd6c 100644
--- a/Essentials/src/com/earth2me/essentials/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/IEssentials.java
@@ -24,6 +24,9 @@ public interface IEssentials extends Plugin
 
 	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
 
+	@Deprecated
+	User getUser(Object base);
+	
 	User getUser(String base);
 	
 	User getUser(Player base);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
index 82b74d7bd..825c37c70 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
@@ -44,9 +44,9 @@ public class Commandr extends EssentialsCommand
 		}
 
 		final CommandSource target = replyTo.getReplyTo();
-		final String targetName = target instanceof Player ? ((Player)target).getDisplayName() : Console.NAME;
+		final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME;
 
-		if (target == null || ((target instanceof Player) && !((Player)target).isOnline()))
+		if (target == null || (target.isPlayer() && !target.getPlayer().isOnline()))
 		{
 			throw new Exception(_("foreverAlone"));
 		}