diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 9b9d3ac9d..61f42931a 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -628,6 +628,14 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		{
 			return getUser((Player)base);
 		}
+		if (base instanceof org.bukkit.OfflinePlayer)
+		{
+			return getUser(((org.bukkit.OfflinePlayer)base).getUniqueId());
+		}
+		if (base instanceof UUID)
+		{
+			return getUser((UUID)base);
+		}
 		if (base instanceof String)
 		{
 			return getOfflineUser((String)base);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
index 300f93b2d..0eedb61ca 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
@@ -349,11 +349,14 @@ public class Commandessentials extends EssentialsCommand
 		String name = args[1];
 		sender.sendMessage("Looking up UUID for " + name);
 
+		UUID onlineUUID = null;
+
 		for (Player player : server.getOnlinePlayers())
 		{
 			if (player.getName().equalsIgnoreCase(name))
 			{
 				sender.sendMessage("Online player: " + player.getUniqueId().toString());
+				onlineUUID = player.getUniqueId();
 			}
 		}