diff --git a/Source/Game/Chat/Commands/AccountCommands.cs b/Source/Game/Chat/Commands/AccountCommands.cs
index 943742e57..558edfc5b 100644
--- a/Source/Game/Chat/Commands/AccountCommands.cs
+++ b/Source/Game/Chat/Commands/AccountCommands.cs
@@ -452,10 +452,10 @@ namespace Game.Chat
                     realmID = realmId.Value;
 
                 AccountTypes playerSecurity;
-                if (handler.GetSession() != null)
-                    playerSecurity = Global.AccountMgr.GetSecurity(handler.GetSession().GetAccountId(), realmID);
-                else
+                if (handler.IsConsole())
                     playerSecurity = AccountTypes.Console;
+                else
+                    playerSecurity = Global.AccountMgr.GetSecurity(handler.GetSession().GetAccountId(), realmID);
 
                 // can set security level only for target with less security and to less security that we have
                 // This is also reject self apply in fact
diff --git a/Source/Game/Chat/Commands/BNetAccountCommands.cs b/Source/Game/Chat/Commands/BNetAccountCommands.cs
index d50b8ed7a..5deafb3a1 100644
--- a/Source/Game/Chat/Commands/BNetAccountCommands.cs
+++ b/Source/Game/Chat/Commands/BNetAccountCommands.cs
@@ -411,7 +411,5 @@ namespace Game.Chat.Commands
                 return true;
             }
         }
-
-
     }
 }
diff --git a/Source/Game/Chat/Commands/DebugCommands.cs b/Source/Game/Chat/Commands/DebugCommands.cs
index 3405c9138..81719de4b 100644
--- a/Source/Game/Chat/Commands/DebugCommands.cs
+++ b/Source/Game/Chat/Commands/DebugCommands.cs
@@ -1266,7 +1266,6 @@ namespace Game.Chat
             }
         }
 
-
         [CommandGroup("send")]
         class SendCommands
         {
diff --git a/Source/Game/Chat/Commands/TeleCommands.cs b/Source/Game/Chat/Commands/TeleCommands.cs
index bcb7da881..feb14cfe6 100644
--- a/Source/Game/Chat/Commands/TeleCommands.cs
+++ b/Source/Game/Chat/Commands/TeleCommands.cs
@@ -236,6 +236,7 @@ namespace Game.Chat
             return true;
         }
 
+        [CommandGroup("name")]
         class TeleNameCommands
         {
             [Command("", RBACPermissions.CommandTeleName, true)]
@@ -279,6 +280,7 @@ namespace Game.Chat
                 return DoNameTeleport(handler, player, tele.mapId, new Position(tele.posX, tele.posY, tele.posZ, tele.orientation), tele.name);
             }
 
+            [CommandGroup("npc")]
             class TeleNameNpcCommands
             {
                 [Command("guid", RBACPermissions.CommandTeleName, true)]