diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
index 422dc97a9..c14bfa72e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
@@ -33,8 +33,8 @@ public class Commandmsg extends EssentialsCommand
 
 		String message = getFinalArg(args, 1);
 		
-		IReplyTo replyTo = sender instanceof User?(User)sender:Console.getConsoleReplyTo();
-		String senderName = sender instanceof User?((User)sender).getDisplayName():Console.NAME;
+		IReplyTo replyTo = sender instanceof Player?User.get((Player)sender):Console.getConsoleReplyTo();
+		String senderName = sender instanceof Player?((Player)sender).getDisplayName():Console.NAME;
 		
 		if (args[0].equalsIgnoreCase(Console.NAME))
 		{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
index 9b2aa9233..fe12562ee 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
@@ -25,10 +25,10 @@ public class Commandr extends EssentialsCommand
 		}
 
 		String message = getFinalArg(args, 0);
-		IReplyTo replyTo = sender instanceof User?(User)sender:Console.getConsoleReplyTo();
-		String senderName = sender instanceof User?((User)sender).getDisplayName():Console.NAME;
+		IReplyTo replyTo = sender instanceof Player?User.get((Player)sender):Console.getConsoleReplyTo();
+		String senderName = sender instanceof Player?((Player)sender).getDisplayName():Console.NAME;
 		CommandSender target = replyTo.getReplyTo();
-		String targetName = target instanceof User?((User)target).getDisplayName():Console.NAME;
+		String targetName = target instanceof Player?((Player)target).getDisplayName():Console.NAME;
 
 		if (target == null)
 		{
@@ -39,10 +39,12 @@ public class Commandr extends EssentialsCommand
 		sender.sendMessage("[Me -> " + targetName + "] " + message);
 		target.sendMessage("[" + senderName  + " -> Me] " + message);
 		replyTo.setReplyTo(target);
-		if (target instanceof Player) {
-			User.get((Player)target).setReplyTo(sender);
-		} else {
-			Console.getConsoleReplyTo().setReplyTo(sender);
+		if (target != sender) {
+			if (target instanceof Player) {
+				User.get((Player)target).setReplyTo(sender);
+			} else {
+				Console.getConsoleReplyTo().setReplyTo(sender);
+			}
 		}
 	}
 }