diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java
index c48e5a8a3..e7735deb1 100644
--- a/src/services/chat/ChatService.java
+++ b/src/services/chat/ChatService.java
@@ -75,8 +75,12 @@ public class ChatService extends Service {
 	}
 	
 	private void handleInstantMessage(PlayerManager playerMgr, Player sender, ChatInstantMessageToCharacter request) {
-		String strReceiver = request.getCharacter();
-		String strSender = sender.getCreatureObject().getName();
+		String strReceiver = request.getCharacter().toLowerCase();
+		String strSender = sender.getCreatureObject().getName().toLowerCase();
+		
+		if (strSender.contains(" "))
+			strSender = strSender.split(" ")[0];
+		
 		Player receiver = playerMgr.getPlayerByCreatureFirstName(strReceiver);
 
 		int errorCode = 0; // 0 = No issue, 4 = "strReceiver is not online"
diff --git a/src/services/player/PlayerManager.java b/src/services/player/PlayerManager.java
index e55c8e62e..604faa2e7 100644
--- a/src/services/player/PlayerManager.java
+++ b/src/services/player/PlayerManager.java
@@ -74,7 +74,6 @@ public class PlayerManager extends Manager {
 	}
 	
 	public Player getPlayerByCreatureFirstName(String name) {
-		name = name.toLowerCase();
 		synchronized (players) {
 			for (Player p : players.values()) {
 				if (p.getCreatureObject() != null) {