diff --git a/Source/Game/Chat/Commands/BanCommands.cs b/Source/Game/Chat/Commands/BanCommands.cs
index 6ad8e1608..a3cb1ebcc 100644
--- a/Source/Game/Chat/Commands/BanCommands.cs
+++ b/Source/Game/Chat/Commands/BanCommands.cs
@@ -213,6 +213,12 @@ namespace Game.Chat.Commands
                 return false;
 
             string name = args.NextString();
+            if (!ObjectManager.NormalizePlayerName(ref name))
+            {
+                handler.SendSysMessage(CypherStrings.BaninfoNocharacter);
+                return false;
+            }
+
             Player target = Global.ObjAccessor.FindPlayerByName(name);
             ObjectGuid targetGuid;
 
diff --git a/Source/Game/Handlers/CalendarHandler.cs b/Source/Game/Handlers/CalendarHandler.cs
index 29bfb1dd1..1ebedefc5 100644
--- a/Source/Game/Handlers/CalendarHandler.cs
+++ b/Source/Game/Handlers/CalendarHandler.cs
@@ -241,6 +241,9 @@ namespace Game
             Team inviteeTeam = 0;
             ulong inviteeGuildId = 0;
 
+            if (!ObjectManager.NormalizePlayerName(ref calendarEventInvite.Name))
+                return;
+
             Player player = Global.ObjAccessor.FindPlayerByName(calendarEventInvite.Name);
             if (player)
             {