diff --git a/Source/Game/Chat/Commands/NPCCommands.cs b/Source/Game/Chat/Commands/NPCCommands.cs
index 1528cacc4..3afbc6426 100644
--- a/Source/Game/Chat/Commands/NPCCommands.cs
+++ b/Source/Game/Chat/Commands/NPCCommands.cs
@@ -289,7 +289,7 @@ namespace Game.Chat
                 handler.SendSysMessage(CypherStrings.SelectCreature);
                 return false;
             }
-            string text = args.NextString();
+            string text = args.GetString();
             creature.Say(text, Language.Universal);
 
             // make some emotes
@@ -316,7 +316,7 @@ namespace Game.Chat
                 return false;
 
             string receiver_str = args.NextString();
-            string text = args.NextString();
+            string text = args.NextString("");
 
             if (string.IsNullOrEmpty(receiver_str) || string.IsNullOrEmpty(text))
             {
diff --git a/Source/Game/Chat/Commands/ServerCommands.cs b/Source/Game/Chat/Commands/ServerCommands.cs
index 29feeb132..4594b246c 100644
--- a/Source/Game/Chat/Commands/ServerCommands.cs
+++ b/Source/Game/Chat/Commands/ServerCommands.cs
@@ -66,7 +66,11 @@ namespace Game.Chat
         [Command("motd", RBACPermissions.CommandServerMotd, true)]
         static bool Motd(StringArguments args, CommandHandler handler)
         {
-            handler.SendSysMessage(CypherStrings.MotdCurrent, Global.WorldMgr.GetMotd());
+            string motd = "";
+            foreach (var line in Global.WorldMgr.GetMotd())
+                motd += line;
+
+            handler.SendSysMessage(CypherStrings.MotdCurrent, motd);
             return true;
         }
 
@@ -349,7 +353,7 @@ namespace Game.Chat
             static bool SetMotd(StringArguments args, CommandHandler handler)
             {
                 Global.WorldMgr.SetMotd(args.NextString(""));
-                handler.SendSysMessage(CypherStrings.MotdNew, args);
+                handler.SendSysMessage(CypherStrings.MotdNew, args.GetString());
                 return true;
             }