diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 611b479bb..6b39cbb9b 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -80,6 +80,11 @@ public class EssentialsPlayerListener extends PlayerListener
 				it.remove();
 			}
 		}
+		if(user.isAfk())
+		{
+			user.setAfk(false);
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
 	}
 
 	@Override
@@ -623,7 +628,7 @@ public class EssentialsPlayerListener extends PlayerListener
 	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
 	{
 		if (event.isCancelled()) return;
-	    Player commandUser = event.getPlayer();
+		User user = ess.getUser(event.getPlayer());	    	
 		String cmd = event.getMessage().toLowerCase();		
 		if (("msg".equals(cmd) || "r".equals(cmd) || "mail".equals(cmd)))
 		{
@@ -631,9 +636,14 @@ public class EssentialsPlayerListener extends PlayerListener
 			{
 				if (ess.getUser(player).isSocialSpyEnabled())
 				{
-					player.sendMessage(ess.getUser(commandUser).getDisplayName() + " : " + cmd);
+					player.sendMessage(user.getDisplayName() + " : " + cmd);
 				}
 			}
 		}
+		if(user.isAfk())
+		{
+			user.setAfk(false);
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
 	}
 }