1 files changed, 12 insertions, 3 deletions
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index d384efc1b07..2082c7e5339 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -63,6 +63,16 @@ bool ChatHandler::HandleAHBotOptionsCommand(const char* args)
     if (ahMapIdStr)
     {
         ahMapID = (uint32) strtoul(ahMapIdStr, NULL, 0);
+        switch (ahMapID)
+        {
+        case 2:
+        case 6:
+        case 7:
+            break;
+        default:
+            opt = NULL;
+            break;
+        }
     }
     if (!opt)
     {
@@ -7114,8 +7124,7 @@ bool ChatHandler::HandleSendMessageCommand(const char* args)
 {
     ///- Find the player
     Player *rPlayer;
-    std::string rName;
-    if(!extractPlayerTarget((char*)args,&rPlayer,NULL,&rName))
+    if(!extractPlayerTarget((char*)args,&rPlayer))
         return false;
 
     char* msg_str = strtok(NULL, "");
@@ -7136,7 +7145,7 @@ bool ChatHandler::HandleSendMessageCommand(const char* args)
     rPlayer->GetSession()->SendAreaTriggerMessage("|cffff0000[Message from administrator]:|r");
 
     //Confirmation message
-    std::string nameLink = playerLink(rName);
+    std::string nameLink = GetNameLink(rPlayer);
     PSendSysMessage(LANG_SENDMESSAGE,nameLink.c_str(),msg_str);
     return true;
 }