Script/Commands: fix all command permissions

29 files changed, 239 insertions, 243 deletions

diff --git a/src/scripts/Commands/cs_account.cpp b/src/scripts/Commands/cs_account.cpp
index 22596bd939..d5b4bc6444 100644
--- a/src/scripts/Commands/cs_account.cpp
+++ b/src/scripts/Commands/cs_account.cpp
@@ -27,7 +27,7 @@ public:
     {
         static std::vector<ChatCommand> accountSetCommandTable =
         {
-            { "addon", SEC_ADMINISTRATOR, true, &HandleAccountSetAddonCommand, "" },
+            { "addon", SEC_GAMEMASTER, true, &HandleAccountSetAddonCommand, "" },
             { "gmlevel", SEC_CONSOLE, true, &HandleAccountSetGmLevelCommand, "" },
             { "password", SEC_CONSOLE, true, &HandleAccountSetPasswordCommand, "" }
         };
diff --git a/src/scripts/Commands/cs_achievement.cpp b/src/scripts/Commands/cs_achievement.cpp
index cb9470e431..f0059ca76d 100644
--- a/src/scripts/Commands/cs_achievement.cpp
+++ b/src/scripts/Commands/cs_achievement.cpp
@@ -25,12 +25,12 @@ public:
     {
         static std::vector<ChatCommand> achievementCommandTable =
         {
-            { "add",            SEC_ADMINISTRATOR,  false,  &HandleAchievementAddCommand,      "" },
+            { "add",            SEC_GAMEMASTER,     false,  &HandleAchievementAddCommand,      "" },
             { "checkall",       SEC_ADMINISTRATOR,  false,  &HandleAchievementCheckAllCommand, "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "achievement",    SEC_ADMINISTRATOR,  false, nullptr,            "", achievementCommandTable }
+            { "achievement",    SEC_GAMEMASTER,  false, nullptr,            "", achievementCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_ban.cpp b/src/scripts/Commands/cs_ban.cpp
index 52cad18f0c..b0cc058a7f 100644
--- a/src/scripts/Commands/cs_ban.cpp
+++ b/src/scripts/Commands/cs_ban.cpp
@@ -28,36 +28,36 @@ public:
     {
         static std::vector<ChatCommand> unbanCommandTable =
         {
-            { "account",        SEC_ADMINISTRATOR,  true,  &HandleUnBanAccountCommand,          "" },
-            { "character",      SEC_ADMINISTRATOR,  true,  &HandleUnBanCharacterCommand,        "" },
-            { "playeraccount",  SEC_ADMINISTRATOR,  true,  &HandleUnBanAccountByCharCommand,    "" },
-            { "ip",             SEC_ADMINISTRATOR,  true,  &HandleUnBanIPCommand,               "" }
+            { "account",        SEC_GAMEMASTER,  true,  &HandleUnBanAccountCommand,          "" },
+            { "character",      SEC_GAMEMASTER,  true,  &HandleUnBanCharacterCommand,        "" },
+            { "playeraccount",  SEC_GAMEMASTER,  true,  &HandleUnBanAccountByCharCommand,    "" },
+            { "ip",             SEC_GAMEMASTER,  true,  &HandleUnBanIPCommand,               "" }
         };
         static std::vector<ChatCommand> banlistCommandTable =
         {
-            { "account",        SEC_ADMINISTRATOR,  true,  &HandleBanListAccountCommand,        "" },
-            { "character",      SEC_ADMINISTRATOR,  true,  &HandleBanListCharacterCommand,      "" },
-            { "ip",             SEC_ADMINISTRATOR,  true,  &HandleBanListIPCommand,             "" }
+            { "account",        SEC_GAMEMASTER,  true,  &HandleBanListAccountCommand,        "" },
+            { "character",      SEC_GAMEMASTER,  true,  &HandleBanListCharacterCommand,      "" },
+            { "ip",             SEC_GAMEMASTER,  true,  &HandleBanListIPCommand,             "" }
         };
         static std::vector<ChatCommand> baninfoCommandTable =
         {
-            { "account",        SEC_ADMINISTRATOR,  true,  &HandleBanInfoAccountCommand,        "" },
-            { "character",      SEC_ADMINISTRATOR,  true,  &HandleBanInfoCharacterCommand,      "" },
-            { "ip",             SEC_ADMINISTRATOR,  true,  &HandleBanInfoIPCommand,             "" }
+            { "account",        SEC_GAMEMASTER,  true,  &HandleBanInfoAccountCommand,        "" },
+            { "character",      SEC_GAMEMASTER,  true,  &HandleBanInfoCharacterCommand,      "" },
+            { "ip",             SEC_GAMEMASTER,  true,  &HandleBanInfoIPCommand,             "" }
         };
         static std::vector<ChatCommand> banCommandTable =
         {
-            { "account",        SEC_ADMINISTRATOR,  true,  &HandleBanAccountCommand,            "" },
-            { "character",      SEC_ADMINISTRATOR,  true,  &HandleBanCharacterCommand,          "" },
-            { "playeraccount",  SEC_ADMINISTRATOR,  true,  &HandleBanAccountByCharCommand,      "" },
-            { "ip",             SEC_ADMINISTRATOR,  true,  &HandleBanIPCommand,                 "" }
+            { "account",        SEC_GAMEMASTER,  true,  &HandleBanAccountCommand,            "" },
+            { "character",      SEC_GAMEMASTER,  true,  &HandleBanCharacterCommand,          "" },
+            { "playeraccount",  SEC_GAMEMASTER,  true,  &HandleBanAccountByCharCommand,      "" },
+            { "ip",             SEC_GAMEMASTER,  true,  &HandleBanIPCommand,                 "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "ban",            SEC_ADMINISTRATOR,  true,  nullptr,                                "", banCommandTable },
-            { "baninfo",        SEC_ADMINISTRATOR,  true,  nullptr,                                "", baninfoCommandTable },
-            { "banlist",        SEC_ADMINISTRATOR,  true,  nullptr,                                "", banlistCommandTable },
-            { "unban",          SEC_ADMINISTRATOR,  true,  nullptr,                                "", unbanCommandTable }
+            { "ban",            SEC_GAMEMASTER,  true,  nullptr,                             "", banCommandTable },
+            { "baninfo",        SEC_GAMEMASTER,  true,  nullptr,                             "", baninfoCommandTable },
+            { "banlist",        SEC_GAMEMASTER,  true,  nullptr,                             "", banlistCommandTable },
+            { "unban",          SEC_GAMEMASTER,  true,  nullptr,                             "", unbanCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_cast.cpp b/src/scripts/Commands/cs_cast.cpp
index e65fcb76e2..3e4a599b0a 100644
--- a/src/scripts/Commands/cs_cast.cpp
+++ b/src/scripts/Commands/cs_cast.cpp
@@ -27,16 +27,16 @@ public:
     {
         static std::vector<ChatCommand> castCommandTable =
         {   
-            { "back",           SEC_ADMINISTRATOR,  false, &HandleCastBackCommand,              "" },
-            { "dist",           SEC_ADMINISTRATOR,  false, &HandleCastDistCommand,              "" },
-            { "self",           SEC_ADMINISTRATOR,  false, &HandleCastSelfCommand,              "" },
-            { "target",         SEC_ADMINISTRATOR,  false, &HandleCastTargetCommad,             "" },
-            { "dest",           SEC_ADMINISTRATOR,  false, &HandleCastDestCommand,              "" },
-            { "",               SEC_ADMINISTRATOR,  false, &HandleCastCommand,                  "" }
+            { "back",           SEC_GAMEMASTER,  false, &HandleCastBackCommand,              "" },
+            { "dist",           SEC_GAMEMASTER,  false, &HandleCastDistCommand,              "" },
+            { "self",           SEC_GAMEMASTER,  false, &HandleCastSelfCommand,              "" },
+            { "target",         SEC_GAMEMASTER,  false, &HandleCastTargetCommad,             "" },
+            { "dest",           SEC_GAMEMASTER,  false, &HandleCastDestCommand,              "" },
+            { "",               SEC_GAMEMASTER,  false, &HandleCastCommand,                  "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "cast",           SEC_ADMINISTRATOR,  false, nullptr,                                "", castCommandTable }
+            { "cast",           SEC_GAMEMASTER,  false, nullptr,                                "", castCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_character.cpp b/src/scripts/Commands/cs_character.cpp
index dcf98d5e6a..c2b1d5d6c0 100644
--- a/src/scripts/Commands/cs_character.cpp
+++ b/src/scripts/Commands/cs_character.cpp
@@ -37,7 +37,7 @@ public:
             { "customize",      SEC_GAMEMASTER,     true,  &HandleCharacterCustomizeCommand,       "" },
             { "changefaction",  SEC_GAMEMASTER,     true,  &HandleCharacterChangeFactionCommand,   "" },
             { "changerace",     SEC_GAMEMASTER,     true,  &HandleCharacterChangeRaceCommand,      "" },
-            { "level",          SEC_ADMINISTRATOR,  true,  &HandleCharacterLevelCommand,           "" },
+            { "level",          SEC_GAMEMASTER,     true,  &HandleCharacterLevelCommand,           "" },
             { "rename",         SEC_GAMEMASTER,     true,  &HandleCharacterRenameCommand,          "" },
             { "reputation",     SEC_GAMEMASTER,     true,  &HandleCharacterReputationCommand,      "" },
             { "titles",         SEC_GAMEMASTER,     true,  &HandleCharacterTitlesCommand,          "" }
@@ -46,7 +46,7 @@ public:
         static std::vector<ChatCommand> commandTable =
         {
             { "character",      SEC_GAMEMASTER,     true,  nullptr,                                   "", characterCommandTable },
-            { "levelup",        SEC_ADMINISTRATOR,  false, &HandleLevelUpCommand,                  "" },
+            { "levelup",        SEC_GAMEMASTER,     false, &HandleLevelUpCommand,                  "" },
             { "pdump",          SEC_ADMINISTRATOR,  true,  nullptr,                                   "", pdumpCommandTable }
         };
         return commandTable;
diff --git a/src/scripts/Commands/cs_debug.cpp b/src/scripts/Commands/cs_debug.cpp
index fd544dfe63..31c55bbb85 100644
--- a/src/scripts/Commands/cs_debug.cpp
+++ b/src/scripts/Commands/cs_debug.cpp
@@ -33,9 +33,9 @@ public:
     {
         static std::vector<ChatCommand> debugPlayCommandTable =
         {
-            { "cinematic",      SEC_GAMEMASTER,      false, &HandleDebugPlayCinematicCommand,   "" },
-            { "movie",          SEC_GAMEMASTER,      false, &HandleDebugPlayMovieCommand,       "" },
-            { "sound",          SEC_GAMEMASTER,      false, &HandleDebugPlaySoundCommand,       "" }
+            { "cinematic",      SEC_MODERATOR,      false, &HandleDebugPlayCinematicCommand,   "" },
+            { "movie",          SEC_MODERATOR,      false, &HandleDebugPlayMovieCommand,       "" },
+            { "sound",          SEC_MODERATOR,      false, &HandleDebugPlaySoundCommand,       "" }
         };
         static std::vector<ChatCommand> debugSendCommandTable =
         {
@@ -55,17 +55,17 @@ public:
         {
             { "setbit",         SEC_ADMINISTRATOR,  false, &HandleDebugSet32BitCommand,        "" },
             { "threat",         SEC_ADMINISTRATOR,  false, &HandleDebugThreatListCommand,      "" },
-            { "hostil",         SEC_ADMINISTRATOR,  false, &HandleDebugHostileRefListCommand,  "" },
-            { "anim",           SEC_GAMEMASTER,     false, &HandleDebugAnimCommand,            "" },
+            { "hostil",         SEC_MODERATOR,      false, &HandleDebugHostileRefListCommand,  "" },
+            { "anim",           SEC_ADMINISTRATOR,  false, &HandleDebugAnimCommand,            "" },
             { "arena",          SEC_ADMINISTRATOR,  false, &HandleDebugArenaCommand,           "" },
             { "bg",             SEC_ADMINISTRATOR,  false, &HandleDebugBattlegroundCommand,    "" },
             { "getitemstate",   SEC_ADMINISTRATOR,  false, &HandleDebugGetItemStateCommand,    "" },
-            { "lootrecipient",  SEC_GAMEMASTER,     false, &HandleDebugGetLootRecipientCommand, "" },
+            { "lootrecipient",  SEC_ADMINISTRATOR,  false, &HandleDebugGetLootRecipientCommand, "" },
             { "getvalue",       SEC_ADMINISTRATOR,  false, &HandleDebugGetValueCommand,        "" },
             { "getitemvalue",   SEC_ADMINISTRATOR,  false, &HandleDebugGetItemValueCommand,    "" },
             { "Mod32Value",     SEC_ADMINISTRATOR,  false, &HandleDebugMod32ValueCommand,      "" },
-            { "play",           SEC_GAMEMASTER,      false, nullptr,              "", debugPlayCommandTable },
-            { "send",           SEC_ADMINISTRATOR,  false, nullptr,              "", debugSendCommandTable },
+            { "play",           SEC_MODERATOR,      false, nullptr,                            "", debugPlayCommandTable },
+            { "send",           SEC_ADMINISTRATOR,  false, nullptr,                            "", debugSendCommandTable },
             { "setaurastate",   SEC_ADMINISTRATOR,  false, &HandleDebugSetAuraStateCommand,    "" },
             { "setitemvalue",   SEC_ADMINISTRATOR,  false, &HandleDebugSetItemValueCommand,    "" },
             { "setvalue",       SEC_ADMINISTRATOR,  false, &HandleDebugSetValueCommand,        "" },
@@ -76,7 +76,7 @@ public:
             { "update",         SEC_ADMINISTRATOR,  false, &HandleDebugUpdateCommand,          "" },
             { "itemexpire",     SEC_ADMINISTRATOR,  false, &HandleDebugItemExpireCommand,      "" },
             { "areatriggers",   SEC_ADMINISTRATOR,  false, &HandleDebugAreaTriggersCommand,    "" },
-            { "los",            SEC_GAMEMASTER,      false, &HandleDebugLoSCommand,             "" },
+            { "los",            SEC_ADMINISTRATOR,  false, &HandleDebugLoSCommand,             "" },
             { "moveflags",      SEC_ADMINISTRATOR,  false, &HandleDebugMoveflagsCommand,       "" },
             { "unitstate",      SEC_ADMINISTRATOR,  false, &HandleDebugUnitStateCommand,       "" }
         };
diff --git a/src/scripts/Commands/cs_gm.cpp b/src/scripts/Commands/cs_gm.cpp
index 06b2033d52..466ff6b567 100644
--- a/src/scripts/Commands/cs_gm.cpp
+++ b/src/scripts/Commands/cs_gm.cpp
@@ -30,15 +30,15 @@ public:
         static std::vector<ChatCommand> gmCommandTable =
         {
             { "chat",           SEC_GAMEMASTER,      false, &HandleGMChatCommand,              "" },
-            { "fly",            SEC_ADMINISTRATOR,  false, &HandleGMFlyCommand,               "" },
-            //{ "ingame",         SEC_PLAYER,         true,  &HandleGMListIngameCommand,        "" },
-            { "list",           SEC_ADMINISTRATOR,  true,  &HandleGMListFullCommand,          "" },
+            { "fly",            SEC_GAMEMASTER,      false, &HandleGMFlyCommand,               "" },
+            //{ "ingame",         SEC_PLAYER,          true,  &HandleGMListIngameCommand,        "" },
+            { "list",           SEC_GAMEMASTER,      true,  &HandleGMListFullCommand,          "" },
             { "visible",        SEC_GAMEMASTER,      false, &HandleGMVisibleCommand,           "" },
             { "",               SEC_GAMEMASTER,      false, &HandleGMCommand,                  "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "gm",             SEC_GAMEMASTER,      false, nullptr,                     "", gmCommandTable }
+            { "gm",             SEC_MODERATOR,      false, nullptr,                     "", gmCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_go.cpp b/src/scripts/Commands/cs_go.cpp
index 352a177ea9..66a7d5f306 100644
--- a/src/scripts/Commands/cs_go.cpp
+++ b/src/scripts/Commands/cs_go.cpp
@@ -28,21 +28,21 @@ public:
     {
         static std::vector<ChatCommand> goCommandTable =
         {
-            { "creature",       SEC_GAMEMASTER,      false, &HandleGoCreatureCommand,          "" },
-            { "graveyard",      SEC_GAMEMASTER,      false, &HandleGoGraveyardCommand,         "" },
-            { "grid",           SEC_GAMEMASTER,      false, &HandleGoGridCommand,              "" },
-            { "object",         SEC_GAMEMASTER,      false, &HandleGoObjectCommand,            "" },
-            { "taxinode",       SEC_GAMEMASTER,      false, &HandleGoTaxinodeCommand,          "" },
-            { "trigger",        SEC_GAMEMASTER,      false, &HandleGoTriggerCommand,           "" },
-            { "zonexy",         SEC_GAMEMASTER,      false, &HandleGoZoneXYCommand,            "" },
-            { "xyz",            SEC_GAMEMASTER,      false, &HandleGoXYZCommand,               "" },
-            { "ticket",         SEC_GAMEMASTER,      false, &HandleGoTicketCommand,            "" },
-            { "",               SEC_GAMEMASTER,      false, &HandleGoXYZCommand,               "" }
+            { "creature",       SEC_MODERATOR,      false, &HandleGoCreatureCommand,          "" },
+            { "graveyard",      SEC_MODERATOR,      false, &HandleGoGraveyardCommand,         "" },
+            { "grid",           SEC_MODERATOR,      false, &HandleGoGridCommand,              "" },
+            { "object",         SEC_MODERATOR,      false, &HandleGoObjectCommand,            "" },
+            { "taxinode",       SEC_MODERATOR,      false, &HandleGoTaxinodeCommand,          "" },
+            { "trigger",        SEC_MODERATOR,      false, &HandleGoTriggerCommand,           "" },
+            { "zonexy",         SEC_MODERATOR,      false, &HandleGoZoneXYCommand,            "" },
+            { "xyz",            SEC_MODERATOR,      false, &HandleGoXYZCommand,               "" },
+            { "ticket",         SEC_GAMEMASTER,     false, &HandleGoTicketCommand,            "" },
+            { "",               SEC_MODERATOR,      false, &HandleGoXYZCommand,               "" }
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            { "go",             SEC_GAMEMASTER,      false, nullptr,                     "", goCommandTable }
+            { "go",             SEC_MODERATOR,      false, nullptr,                     "", goCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/scripts/Commands/cs_gobject.cpp
index bbb80fb0f1..366946a0c1 100644
--- a/src/scripts/Commands/cs_gobject.cpp
+++ b/src/scripts/Commands/cs_gobject.cpp
@@ -32,29 +32,29 @@ public:
     {
         static std::vector<ChatCommand> gobjectAddCommandTable =
         {
-            { "temp",           SEC_GAMEMASTER,     false, &HandleGameObjectAddTempCommand,   "" },
-            { "",               SEC_GAMEMASTER,     false, &HandleGameObjectAddCommand,       "" }
+            { "temp",           SEC_GAMEMASTER,        false, &HandleGameObjectAddTempCommand,   "" },
+            { "",               SEC_ADMINISTRATOR,     false, &HandleGameObjectAddCommand,       "" }
         };
         static std::vector<ChatCommand> gobjectSetCommandTable =
         {
-            { "phase",          SEC_GAMEMASTER,     false, &HandleGameObjectSetPhaseCommand,  "" },
-            { "state",          SEC_GAMEMASTER,     false, &HandleGameObjectSetStateCommand,  "" }
+            { "phase",          SEC_ADMINISTRATOR,     false, &HandleGameObjectSetPhaseCommand,  "" },
+            { "state",          SEC_ADMINISTRATOR,     false, &HandleGameObjectSetStateCommand,  "" }
         };
         static std::vector<ChatCommand> gobjectCommandTable =
         {
-            { "activate",       SEC_GAMEMASTER,     false, &HandleGameObjectActivateCommand,  "" },
-            { "delete",         SEC_GAMEMASTER,     false, &HandleGameObjectDeleteCommand,    "" },
-            { "info",           SEC_GAMEMASTER,     false, &HandleGameObjectInfoCommand,      "" },
-            { "move",           SEC_GAMEMASTER,     false, &HandleGameObjectMoveCommand,      "" },
-            { "near",           SEC_GAMEMASTER,     false, &HandleGameObjectNearCommand,      "" },
-            { "target",         SEC_GAMEMASTER,     false, &HandleGameObjectTargetCommand,    "" },
-            { "turn",           SEC_GAMEMASTER,     false, &HandleGameObjectTurnCommand,      "" },
-            { "add",            SEC_GAMEMASTER,     false, nullptr,            "", gobjectAddCommandTable },
-            { "set",            SEC_GAMEMASTER,     false, nullptr,            "", gobjectSetCommandTable }
+            { "activate",       SEC_ADMINISTRATOR,     false, &HandleGameObjectActivateCommand,  "" },
+            { "delete",         SEC_ADMINISTRATOR,     false, &HandleGameObjectDeleteCommand,    "" },
+            { "info",           SEC_MODERATOR,         false, &HandleGameObjectInfoCommand,      "" },
+            { "move",           SEC_ADMINISTRATOR,     false, &HandleGameObjectMoveCommand,      "" },
+            { "near",           SEC_MODERATOR,         false, &HandleGameObjectNearCommand,      "" },
+            { "target",         SEC_MODERATOR,         false, &HandleGameObjectTargetCommand,    "" },
+            { "turn",           SEC_ADMINISTRATOR,     false, &HandleGameObjectTurnCommand,      "" },
+            { "add",            SEC_ADMINISTRATOR,     false, nullptr,                           "", gobjectAddCommandTable },
+            { "set",            SEC_ADMINISTRATOR,     false, nullptr,                           "", gobjectSetCommandTable }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "gobject",        SEC_GAMEMASTER,     false, nullptr,                "", gobjectCommandTable }
+            { "gobject",        SEC_MODERATOR,     false, nullptr,                               "", gobjectCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_guild.cpp b/src/scripts/Commands/cs_guild.cpp
index f8ae16d58b..6389430608 100644
--- a/src/scripts/Commands/cs_guild.cpp
+++ b/src/scripts/Commands/cs_guild.cpp
@@ -35,7 +35,7 @@ public:
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "guild",          SEC_ADMINISTRATOR,  true, nullptr,                                 "", guildCommandTable }
+            { "guild",          SEC_GAMEMASTER,  true, nullptr,                                 "", guildCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_honor.cpp b/src/scripts/Commands/cs_honor.cpp
index 39c13e22fa..7ec5c8c957 100644
--- a/src/scripts/Commands/cs_honor.cpp
+++ b/src/scripts/Commands/cs_honor.cpp
@@ -32,13 +32,13 @@ public:
 
         static std::vector<ChatCommand> honorCommandTable =
         {
-            { "add",            SEC_GAMEMASTER,     false, nullptr,               "", honorAddCommandTable },
+            { "add",            SEC_GAMEMASTER,     false, nullptr,                            "", honorAddCommandTable },
             { "update",         SEC_GAMEMASTER,     false, &HandleHonorUpdateCommand,          "" }
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            { "honor",          SEC_GAMEMASTER,     false, nullptr,                  "", honorCommandTable }
+            { "honor",          SEC_GAMEMASTER,     false, nullptr,                            "", honorCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_instance.cpp b/src/scripts/Commands/cs_instance.cpp
index 4e053395e4..2a6f28d135 100644
--- a/src/scripts/Commands/cs_instance.cpp
+++ b/src/scripts/Commands/cs_instance.cpp
@@ -29,17 +29,17 @@ public:
     {
         static std::vector<ChatCommand> instanceCommandTable =
         {
-            { "listbinds",      SEC_ADMINISTRATOR,  false,  &HandleInstanceListBindsCommand,    "" },
-            { "unbind",         SEC_ADMINISTRATOR,  false,  &HandleInstanceUnbindCommand,       "" },
-            { "stats",          SEC_ADMINISTRATOR,  true,   &HandleInstanceStatsCommand,        "" },
+            { "listbinds",      SEC_MODERATOR,      false,  &HandleInstanceListBindsCommand,    "" },
+            { "unbind",         SEC_MODERATOR,      false,  &HandleInstanceUnbindCommand,       "" },
+            { "stats",          SEC_MODERATOR,      true,   &HandleInstanceStatsCommand,        "" },
             { "savedata",       SEC_ADMINISTRATOR,  false,  &HandleInstanceSaveDataCommand,     "" },
-            { "setbossstate",   SEC_GAMEMASTER,     true,   &HandleInstanceSetBossStateCommand, "" },
-            { "getbossstate",   SEC_GAMEMASTER,     true,   &HandleInstanceGetBossStateCommand, "" }
+            { "setbossstate",   SEC_MODERATOR,      true,   &HandleInstanceSetBossStateCommand, "" },
+            { "getbossstate",   SEC_MODERATOR,      true,   &HandleInstanceGetBossStateCommand, "" }
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            { "instance",       SEC_ADMINISTRATOR,  true,   nullptr,                               "", instanceCommandTable }
+            { "instance",       SEC_MODERATOR,      true,   nullptr,                            "", instanceCommandTable }
         };
 
         return commandTable;
diff --git a/src/scripts/Commands/cs_learn.cpp b/src/scripts/Commands/cs_learn.cpp
index a24f7dfa39..95641beaa2 100644
--- a/src/scripts/Commands/cs_learn.cpp
+++ b/src/scripts/Commands/cs_learn.cpp
@@ -29,32 +29,32 @@ public:
     {
         static std::vector<ChatCommand> learnAllMyCommandTable =
         {
-            { "class",          SEC_ADMINISTRATOR,  false, &HandleLearnAllMyClassCommand,       "" },
-            { "pettalents",     SEC_ADMINISTRATOR,  false, &HandleLearnAllMyPetTalentsCommand,  "" },
-            { "spells",         SEC_ADMINISTRATOR,  false, &HandleLearnAllMySpellsCommand,      "" },
-            { "talents",        SEC_ADMINISTRATOR,  false, &HandleLearnAllMyTalentsCommand,     "" }
+            { "class",          SEC_GAMEMASTER,  false, &HandleLearnAllMyClassCommand,       "" },
+            { "pettalents",     SEC_GAMEMASTER,  false, &HandleLearnAllMyPetTalentsCommand,  "" },
+            { "spells",         SEC_GAMEMASTER,  false, &HandleLearnAllMySpellsCommand,      "" },
+            { "talents",        SEC_GAMEMASTER,  false, &HandleLearnAllMyTalentsCommand,     "" }
         };
 
         static std::vector<ChatCommand> learnAllCommandTable =
         {
-            { "my",             SEC_ADMINISTRATOR,  false, nullptr,                                "",  learnAllMyCommandTable },
-            { "gm",             SEC_GAMEMASTER,     false, &HandleLearnAllGMCommand,            "" },
-            { "crafts",         SEC_GAMEMASTER,     false, &HandleLearnAllCraftsCommand,        "" },
-            { "default",        SEC_GAMEMASTER,      false, &HandleLearnAllDefaultCommand,       "" },
-            { "lang",           SEC_GAMEMASTER,      false, &HandleLearnAllLangCommand,          "" },
-            { "recipes",        SEC_GAMEMASTER,     false, &HandleLearnAllRecipesCommand,       "" }
+            { "my",             SEC_GAMEMASTER,  false, nullptr,                                "",  learnAllMyCommandTable },
+            { "gm",             SEC_GAMEMASTER,  false, &HandleLearnAllGMCommand,            "" },
+            { "crafts",         SEC_GAMEMASTER,  false, &HandleLearnAllCraftsCommand,        "" },
+            { "default",        SEC_GAMEMASTER,  false, &HandleLearnAllDefaultCommand,       "" },
+            { "lang",           SEC_GAMEMASTER,  false, &HandleLearnAllLangCommand,          "" },
+            { "recipes",        SEC_GAMEMASTER,  false, &HandleLearnAllRecipesCommand,       "" }
         };
 
         static std::vector<ChatCommand> learnCommandTable =
         {
-            { "all",            SEC_ADMINISTRATOR,  false, nullptr,                                "",  learnAllCommandTable },
-            { "",               SEC_ADMINISTRATOR,  false, &HandleLearnCommand,                 "" }
+            { "all",            SEC_GAMEMASTER,  false, nullptr,                                "",  learnAllCommandTable },
+            { "",               SEC_GAMEMASTER,  false, &HandleLearnCommand,                 "" }
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            { "learn",          SEC_GAMEMASTER,      false, nullptr,                                "", learnCommandTable },
-            { "unlearn",        SEC_ADMINISTRATOR,  false, &HandleUnLearnCommand,               "" }
+            { "learn",          SEC_GAMEMASTER,  false, nullptr,                                "", learnCommandTable },
+            { "unlearn",        SEC_GAMEMASTER,  false, &HandleUnLearnCommand,               "" }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/scripts/Commands/cs_lfg.cpp
index 86f057cd0a..2a290b049f 100644
--- a/src/scripts/Commands/cs_lfg.cpp
+++ b/src/scripts/Commands/cs_lfg.cpp
@@ -34,18 +34,16 @@ public:
     {
         static std::vector<ChatCommand> lfgCommandTable =
         {
-            {  "player",     SEC_GAMEMASTER, false, &HandleLfgPlayerInfoCommand, "" },
-            {   "group",     SEC_GAMEMASTER, false,  &HandleLfgGroupInfoCommand, "" },
-            {   "queue",     SEC_GAMEMASTER, false,  &HandleLfgQueueInfoCommand, "" },
-            {   "clean",  SEC_ADMINISTRATOR, false,      &HandleLfgCleanCommand, "" },
-            { "options",  SEC_ADMINISTRATOR, false,    &HandleLfgOptionsCommand, "" },
-            {      nullptr,         SEC_PLAYER, false,                        nullptr, "" }
+            { "player",    SEC_MODERATOR,     false, &HandleLfgPlayerInfoCommand, "" },
+            { "group",     SEC_MODERATOR,     false,  &HandleLfgGroupInfoCommand, "" },
+            { "queue",     SEC_MODERATOR,     false,  &HandleLfgQueueInfoCommand, "" },
+            { "clean",     SEC_ADMINISTRATOR, false,      &HandleLfgCleanCommand, "" },
+            { "options",   SEC_GAMEMASTER,    false,    &HandleLfgOptionsCommand, "" },
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            {       "lfg",   SEC_GAMEMASTER, false,                        nullptr, "", lfgCommandTable },
-            {  nullptr,             SEC_PLAYER, false,                        nullptr, "" }
+            {  "lfg",   SEC_GAMEMASTER, false,                           nullptr, "", lfgCommandTable },
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_list.cpp b/src/scripts/Commands/cs_list.cpp
index 6230c26b4b..4e5b3f5625 100644
--- a/src/scripts/Commands/cs_list.cpp
+++ b/src/scripts/Commands/cs_list.cpp
@@ -28,14 +28,14 @@ public:
     {
         static std::vector<ChatCommand> listCommandTable =
         {
-            { "creature",       SEC_ADMINISTRATOR,  true,  &HandleListCreatureCommand,          "" },
-            { "item",           SEC_ADMINISTRATOR,  true,  &HandleListItemCommand,              "" },
-            { "object",         SEC_ADMINISTRATOR,  true,  &HandleListObjectCommand,            "" },
-            { "auras",          SEC_ADMINISTRATOR,  false, &HandleListAurasCommand,             "" }
+            { "creature",       SEC_MODERATOR,  true,  &HandleListCreatureCommand,          "" },
+            { "item",           SEC_MODERATOR,  true,  &HandleListItemCommand,              "" },
+            { "object",         SEC_MODERATOR,  true,  &HandleListObjectCommand,            "" },
+            { "auras",          SEC_MODERATOR,  false, &HandleListAurasCommand,             "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "list",          SEC_ADMINISTRATOR,   true, nullptr,                                 "", listCommandTable }
+            { "list",          SEC_MODERATOR,   true, nullptr,                                 "", listCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/scripts/Commands/cs_lookup.cpp
index 5d2476071a..4c239f64fe 100644
--- a/src/scripts/Commands/cs_lookup.cpp
+++ b/src/scripts/Commands/cs_lookup.cpp
@@ -37,32 +37,32 @@ public:
 
         static std::vector<ChatCommand> lookupSpellCommandTable =
         {
-            { "id",             SEC_ADMINISTRATOR,  true,  &HandleLookupSpellIdCommand,         "" },
-            { "",               SEC_ADMINISTRATOR,  true,  &HandleLookupSpellCommand,           "" }
+            { "id",             SEC_MODERATOR,      true,  &HandleLookupSpellIdCommand,         "" },
+            { "",               SEC_MODERATOR,      true,  &HandleLookupSpellCommand,           "" }
         };
 
         static std::vector<ChatCommand> lookupCommandTable =
         {
-            { "area",           SEC_GAMEMASTER,      true,  &HandleLookupAreaCommand,            "" },
-            { "creature",       SEC_ADMINISTRATOR,  true,  &HandleLookupCreatureCommand,        "" },
-            { "event",          SEC_GAMEMASTER,     true,  &HandleLookupEventCommand,           "" },
-            { "faction",        SEC_ADMINISTRATOR,  true,  &HandleLookupFactionCommand,         "" },
-            { "item",           SEC_ADMINISTRATOR,  true,  &HandleLookupItemCommand,            "" },
-            { "itemset",        SEC_ADMINISTRATOR,  true,  &HandleLookupItemSetCommand,         "" },
-            { "object",         SEC_ADMINISTRATOR,  true,  &HandleLookupObjectCommand,          "" },
-            { "quest",          SEC_ADMINISTRATOR,  true,  &HandleLookupQuestCommand,           "" },
+            { "area",           SEC_MODERATOR,      true,  &HandleLookupAreaCommand,            "" },
+            { "creature",       SEC_MODERATOR,      true,  &HandleLookupCreatureCommand,        "" },
+            { "event",          SEC_MODERATOR,      true,  &HandleLookupEventCommand,           "" },
+            { "faction",        SEC_MODERATOR,      true,  &HandleLookupFactionCommand,         "" },
+            { "item",           SEC_MODERATOR,      true,  &HandleLookupItemCommand,            "" },
+            { "itemset",        SEC_MODERATOR,      true,  &HandleLookupItemSetCommand,         "" },
+            { "object",         SEC_MODERATOR,      true,  &HandleLookupObjectCommand,          "" },
+            { "quest",          SEC_MODERATOR,      true,  &HandleLookupQuestCommand,           "" },
             { "player",         SEC_GAMEMASTER,     true,  nullptr,                                "", lookupPlayerCommandTable },
-            { "skill",          SEC_ADMINISTRATOR,  true,  &HandleLookupSkillCommand,           "" },
-            { "spell",          SEC_ADMINISTRATOR,  true,  nullptr,                                "", lookupSpellCommandTable },
-            { "taxinode",       SEC_ADMINISTRATOR,  true,  &HandleLookupTaxiNodeCommand,        "" },
-            { "tele",           SEC_GAMEMASTER,      true,  &HandleLookupTeleCommand,            "" },
-            { "title",          SEC_GAMEMASTER,     true,  &HandleLookupTitleCommand,           "" },
-            { "map",            SEC_ADMINISTRATOR,  true,  &HandleLookupMapCommand,             "" }
+            { "skill",          SEC_MODERATOR,      true,  &HandleLookupSkillCommand,           "" },
+            { "spell",          SEC_MODERATOR,      true,  nullptr,                                "", lookupSpellCommandTable },
+            { "taxinode",       SEC_MODERATOR,      true,  &HandleLookupTaxiNodeCommand,        "" },
+            { "tele",           SEC_MODERATOR,      true,  &HandleLookupTeleCommand,            "" },
+            { "title",          SEC_MODERATOR,      true,  &HandleLookupTitleCommand,           "" },
+            { "map",            SEC_MODERATOR,      true,  &HandleLookupMapCommand,             "" }
         };
 
         static std::vector<ChatCommand> commandTable =
         {
-            { "lookup",         SEC_ADMINISTRATOR,  true,  nullptr,                                "", lookupCommandTable }
+            { "lookup",         SEC_MODERATOR,  true,  nullptr,                                 "", lookupCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_message.cpp b/src/scripts/Commands/cs_message.cpp
index 6214a19653..15cd13a876 100644
--- a/src/scripts/Commands/cs_message.cpp
+++ b/src/scripts/Commands/cs_message.cpp
@@ -32,7 +32,7 @@ public:
             { "gmannounce",     SEC_GAMEMASTER,      true,   &HandleGMAnnounceCommand,           "" },
             { "notify",         SEC_GAMEMASTER,      true,   &HandleNotifyCommand,               "" },
             { "gmnotify",       SEC_GAMEMASTER,      true,   &HandleGMNotifyCommand,             "" },
-            { "whispers",       SEC_GAMEMASTER,      false,  &HandleWhispersCommand,             "" }
+            { "whispers",       SEC_MODERATOR,       false,  &HandleWhispersCommand,             "" }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_misc.cpp b/src/scripts/Commands/cs_misc.cpp
index e38f9b5d9e..6fadd18e76 100644
--- a/src/scripts/Commands/cs_misc.cpp
+++ b/src/scripts/Commands/cs_misc.cpp
@@ -37,11 +37,11 @@ public:
     {
         static std::vector<ChatCommand> groupCommandTable =
         {
-            { "leader",         SEC_ADMINISTRATOR,          false,  &HandleGroupLeaderCommand,          "" },
-            { "disband",        SEC_ADMINISTRATOR,          false,  &HandleGroupDisbandCommand,         "" },
-            { "remove",         SEC_ADMINISTRATOR,          false,  &HandleGroupRemoveCommand,          "" },
-            { "join",           SEC_ADMINISTRATOR,          false,  &HandleGroupJoinCommand,            "" },
-            { "list",           SEC_ADMINISTRATOR,          false,  &HandleGroupListCommand,            "" }
+            { "leader",         SEC_GAMEMASTER,             false,  &HandleGroupLeaderCommand,          "" },
+            { "disband",        SEC_GAMEMASTER,             false,  &HandleGroupDisbandCommand,         "" },
+            { "remove",         SEC_GAMEMASTER,             false,  &HandleGroupRemoveCommand,          "" },
+            { "join",           SEC_GAMEMASTER,             false,  &HandleGroupJoinCommand,            "" },
+            { "list",           SEC_GAMEMASTER,             false,  &HandleGroupListCommand,            "" }
         };
         static std::vector<ChatCommand> petCommandTable =
         {
@@ -51,28 +51,28 @@ public:
         };
         static std::vector<ChatCommand> sendCommandTable =
         {
-            { "items",              SEC_ADMINISTRATOR,      true,  &HandleSendItemsCommand,             "" },
+            { "items",              SEC_GAMEMASTER,         true,  &HandleSendItemsCommand,             "" },
             { "mail",               SEC_GAMEMASTER,         true,  &HandleSendMailCommand,              "" },
             { "message",            SEC_ADMINISTRATOR,      true,  &HandleSendMessageCommand,           "" },
-            { "money",              SEC_ADMINISTRATOR,      true,  &HandleSendMoneyCommand,             "" }
+            { "money",              SEC_GAMEMASTER,         true,  &HandleSendMoneyCommand,             "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
             { "dev",                SEC_ADMINISTRATOR,      false, &HandleDevCommand,                   "" },
-            { "gps",                SEC_ADMINISTRATOR,      false, &HandleGPSCommand,                   "" },
-            { "aura",               SEC_ADMINISTRATOR,      false, &HandleAuraCommand,                  "" },
-            { "unaura",             SEC_ADMINISTRATOR,      false, &HandleUnAuraCommand,                "" },
-            { "appear",             SEC_GAMEMASTER,         false, &HandleAppearCommand,                "" },
+            { "gps",                SEC_MODERATOR,          false, &HandleGPSCommand,                   "" },
+            { "aura",               SEC_GAMEMASTER,         false, &HandleAuraCommand,                  "" },
+            { "unaura",             SEC_GAMEMASTER,         false, &HandleUnAuraCommand,                "" },
+            { "appear",             SEC_MODERATOR,          false, &HandleAppearCommand,                "" },
             { "summon",             SEC_GAMEMASTER,         false, &HandleSummonCommand,                "" },
             { "groupsummon",        SEC_GAMEMASTER,         false, &HandleGroupSummonCommand,           "" },
             { "commands",           SEC_PLAYER,             true,  &HandleCommandsCommand,              "" },
-            { "die",                SEC_ADMINISTRATOR,      false, &HandleDieCommand,                   "" },
-            { "revive",             SEC_ADMINISTRATOR,      true,  &HandleReviveCommand,                "" },
+            { "die",                SEC_GAMEMASTER,         false, &HandleDieCommand,                   "" },
+            { "revive",             SEC_GAMEMASTER,         true,  &HandleReviveCommand,                "" },
             { "dismount",           SEC_PLAYER,             false, &HandleDismountCommand,              "" },
             { "guid",               SEC_GAMEMASTER,         false, &HandleGUIDCommand,                  "" },
             { "help",               SEC_PLAYER,             true,  &HandleHelpCommand,                  "" },
             { "itemmove",           SEC_GAMEMASTER,         false, &HandleItemMoveCommand,              "" },
-            { "cooldown",           SEC_ADMINISTRATOR,      false, &HandleCooldownCommand,              "" },
+            { "cooldown",           SEC_GAMEMASTER,         false, &HandleCooldownCommand,              "" },
             { "distance",           SEC_ADMINISTRATOR,      false, &HandleGetDistanceCommand,           "" },
             { "recall",             SEC_GAMEMASTER,         false, &HandleRecallCommand,                "" },
             { "save",               SEC_PLAYER,             false, &HandleSaveCommand,                  "" },
@@ -81,39 +81,39 @@ public:
             { "unstuck",            SEC_GAMEMASTER,         true,  &HandleUnstuckCommand,               "" },
             { "taxicheat",          SEC_GAMEMASTER,         false, &HandleTaxiCheatCommand,             "" },
             { "linkgrave",          SEC_ADMINISTRATOR,      false, &HandleLinkGraveCommand,             "" },
-            { "neargrave",          SEC_ADMINISTRATOR,      false, &HandleNearGraveCommand,             "" },
+            { "neargrave",          SEC_GAMEMASTER,         false, &HandleNearGraveCommand,             "" },
             { "explorecheat",       SEC_ADMINISTRATOR,      false, &HandleExploreCheatCommand,          "" },
-            { "showarea",           SEC_ADMINISTRATOR,      false, &HandleShowAreaCommand,              "" },
+            { "showarea",           SEC_GAMEMASTER,         false, &HandleShowAreaCommand,              "" },
             { "hidearea",           SEC_ADMINISTRATOR,      false, &HandleHideAreaCommand,              "" },
-            { "additem",            SEC_ADMINISTRATOR,      false, &HandleAddItemCommand,               "" },
-            { "additemset",         SEC_ADMINISTRATOR,      false, &HandleAddItemSetCommand,            "" },
+            { "additem",            SEC_GAMEMASTER,         false, &HandleAddItemCommand,               "" },
+            { "additemset",         SEC_GAMEMASTER,         false, &HandleAddItemSetCommand,            "" },
             { "bank",               SEC_ADMINISTRATOR,      false, &HandleBankCommand,                  "" },
             { "wchange",            SEC_ADMINISTRATOR,      false, &HandleChangeWeather,                "" },
-            { "maxskill",           SEC_ADMINISTRATOR,      false, &HandleMaxSkillCommand,              "" },
-            { "setskill",           SEC_ADMINISTRATOR,      false, &HandleSetSkillCommand,              "" },
+            { "maxskill",           SEC_GAMEMASTER,         false, &HandleMaxSkillCommand,              "" },
+            { "setskill",           SEC_GAMEMASTER,         false, &HandleSetSkillCommand,              "" },
             { "pinfo",              SEC_GAMEMASTER,         true,  &HandlePInfoCommand,                 "" },
-            { "respawn",            SEC_ADMINISTRATOR,      false, &HandleRespawnCommand,               "" },
-            { "send",               SEC_GAMEMASTER,         true,  nullptr,                                "", sendCommandTable },
-            { "pet",                SEC_GAMEMASTER,         false, nullptr,                                "", petCommandTable },
+            { "respawn",            SEC_GAMEMASTER,         false, &HandleRespawnCommand,               "" },
+            { "send",               SEC_GAMEMASTER,         true,  nullptr,                             "", sendCommandTable },
+            { "pet",                SEC_GAMEMASTER,         false, nullptr,                             "", petCommandTable },
             { "mute",               SEC_GAMEMASTER,         true,  &HandleMuteCommand,                  "" },
             { "unmute",             SEC_GAMEMASTER,         true,  &HandleUnmuteCommand,                "" },
             { "movegens",           SEC_ADMINISTRATOR,      false, &HandleMovegensCommand,              "" },
             { "cometome",           SEC_ADMINISTRATOR,      false, &HandleComeToMeCommand,              "" },
-            { "damage",             SEC_ADMINISTRATOR,      false, &HandleDamageCommand,                "" },
+            { "damage",             SEC_GAMEMASTER,         false, &HandleDamageCommand,                "" },
             { "combatstop",         SEC_GAMEMASTER,         true,  &HandleCombatStopCommand,            "" },
             { "flusharenapoints",   SEC_ADMINISTRATOR,      false, &HandleFlushArenaPointsCommand,      "" },
             { "repairitems",        SEC_GAMEMASTER,         true,  &HandleRepairitemsCommand,           "" },
             { "waterwalk",          SEC_GAMEMASTER,         false, &HandleWaterwalkCommand,             "" },
             { "freeze",             SEC_GAMEMASTER,         false, &HandleFreezeCommand,                "" },
             { "unfreeze",           SEC_GAMEMASTER,         false, &HandleUnFreezeCommand,              "" },
-            { "group",              SEC_ADMINISTRATOR,      false, nullptr,                                "", groupCommandTable },
-            { "possess",            SEC_ADMINISTRATOR,      false, HandlePossessCommand,                "" },
-            { "unpossess",          SEC_ADMINISTRATOR,      false, HandleUnPossessCommand,              "" },
+            { "group",              SEC_GAMEMASTER,         false, nullptr,                             "", groupCommandTable },
+            { "possess",            SEC_GAMEMASTER,         false, HandlePossessCommand,                "" },
+            { "unpossess",          SEC_GAMEMASTER,         false, HandleUnPossessCommand,              "" },
             { "bindsight",          SEC_ADMINISTRATOR,      false, HandleBindSightCommand,              "" },
             { "unbindsight",        SEC_ADMINISTRATOR,      false, HandleUnbindSightCommand,            "" },
             { "playall",            SEC_GAMEMASTER,         false, HandlePlayAllCommand,                "" },
             { "skirmish",           SEC_ADMINISTRATOR,      false, HandleSkirmishCommand,               "" },
-            { "mailbox",            SEC_ADMINISTRATOR,      false, &HandleMailBoxCommand,               "" }
+            { "mailbox",            SEC_MODERATOR,          false, &HandleMailBoxCommand,               "" }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_modify.cpp b/src/scripts/Commands/cs_modify.cpp
index 94fb1d0cfa..7dc571f5bb 100644
--- a/src/scripts/Commands/cs_modify.cpp
+++ b/src/scripts/Commands/cs_modify.cpp
@@ -46,24 +46,24 @@ public:
             { "money",          SEC_GAMEMASTER,      false, &HandleModifyMoneyCommand,         "" },
             { "scale",          SEC_GAMEMASTER,      false, &HandleModifyScaleCommand,         "" },
             { "bit",            SEC_GAMEMASTER,      false, &HandleModifyBitCommand,           "" },
-            { "faction",        SEC_GAMEMASTER,      false, &HandleModifyFactionCommand,       "" },
+            { "faction",        SEC_ADMINISTRATOR,   false, &HandleModifyFactionCommand,       "" },
             { "spell",          SEC_GAMEMASTER,      false, &HandleModifySpellCommand,         "" },
             { "talentpoints",   SEC_GAMEMASTER,      false, &HandleModifyTalentCommand,        "" },
             { "mount",          SEC_GAMEMASTER,      false, &HandleModifyMountCommand,         "" },
             { "honor",          SEC_GAMEMASTER,      false, &HandleModifyHonorCommand,         "" },
-            { "reputation",     SEC_GAMEMASTER,     false, &HandleModifyRepCommand,           "" },
+            { "reputation",     SEC_GAMEMASTER,      false, &HandleModifyRepCommand,           "" },
             { "arenapoints",    SEC_GAMEMASTER,      false, &HandleModifyArenaCommand,         "" },
             { "drunk",          SEC_GAMEMASTER,      false, &HandleModifyDrunkCommand,         "" },
-            { "standstate",     SEC_GAMEMASTER,     false, &HandleModifyStandStateCommand,    "" },
-            { "phase",          SEC_ADMINISTRATOR,  false, &HandleModifyPhaseCommand,         "" },
-            { "gender",         SEC_GAMEMASTER,     false, &HandleModifyGenderCommand,        "" },
-            { "speed",          SEC_GAMEMASTER,      false, nullptr,           "", modifyspeedCommandTable }
+            { "standstate",     SEC_GAMEMASTER,      false, &HandleModifyStandStateCommand,    "" },
+            { "phase",          SEC_GAMEMASTER,      false, &HandleModifyPhaseCommand,         "" },
+            { "gender",         SEC_GAMEMASTER,      false, &HandleModifyGenderCommand,        "" },
+            { "speed",          SEC_GAMEMASTER,      false, nullptr,                           "", modifyspeedCommandTable }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "morph",          SEC_GAMEMASTER,     false, &HandleModifyMorphCommand,          "" },
-            { "demorph",        SEC_GAMEMASTER,     false, &HandleDeMorphCommand,              "" },
-            { "modify",         SEC_GAMEMASTER,      false, nullptr,                 "", modifyCommandTable }
+            { "morph",          SEC_MODERATOR,      false, &HandleModifyMorphCommand,          "" },
+            { "demorph",        SEC_MODERATOR,      false, &HandleDeMorphCommand,              "" },
+            { "modify",         SEC_GAMEMASTER,     false, nullptr,                            "", modifyCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_npc.cpp b/src/scripts/Commands/cs_npc.cpp
index 5b30e66742..075eae219c 100644
--- a/src/scripts/Commands/cs_npc.cpp
+++ b/src/scripts/Commands/cs_npc.cpp
@@ -67,19 +67,19 @@ public:
     {
         static std::vector<ChatCommand> npcAddCommandTable =
         {
-            { "formation",      SEC_GAMEMASTER,      false, &HandleNpcAddFormationCommand,      "" },
-            { "item",           SEC_GAMEMASTER,     false, &HandleNpcAddVendorItemCommand,     "" },
-            { "move",           SEC_GAMEMASTER,     false, &HandleNpcAddMoveCommand,           "" },
-            { "temp",           SEC_GAMEMASTER,     false, &HandleNpcAddTempSpawnCommand,      "" },
+            { "formation",      SEC_ADMINISTRATOR,  false, &HandleNpcAddFormationCommand,      "" },
+            { "item",           SEC_ADMINISTRATOR,  false, &HandleNpcAddVendorItemCommand,     "" },
+            { "move",           SEC_ADMINISTRATOR,  false, &HandleNpcAddMoveCommand,           "" },
+            { "temp",           SEC_ADMINISTRATOR,  false, &HandleNpcAddTempSpawnCommand,      "" },
             //{ TODO: fix or remove this command
             { "weapon",         SEC_ADMINISTRATOR,  false, &HandleNpcAddWeaponCommand,         "" },
             //}
-            { "",               SEC_GAMEMASTER,     false, &HandleNpcAddCommand,               "" }
+            { "",               SEC_ADMINISTRATOR,  false, &HandleNpcAddCommand,               "" }
         };
         static std::vector<ChatCommand> npcDeleteCommandTable =
         {
-            { "item",           SEC_GAMEMASTER,     false, &HandleNpcDeleteVendorItemCommand,  "" },
-            { "",               SEC_GAMEMASTER,     false, &HandleNpcDeleteCommand,            "" }
+            { "item",           SEC_ADMINISTRATOR,  false, &HandleNpcDeleteVendorItemCommand,  "" },
+            { "",               SEC_ADMINISTRATOR,  false, &HandleNpcDeleteCommand,            "" }
         };
         static std::vector<ChatCommand> npcFollowCommandTable =
         {
@@ -90,40 +90,40 @@ public:
         {
             { "allowmove",      SEC_ADMINISTRATOR,  false, &HandleNpcSetAllowMovementCommand,  "" },
             { "entry",          SEC_ADMINISTRATOR,  false, &HandleNpcSetEntryCommand,          "" },
-            { "factionid",      SEC_GAMEMASTER,     false, &HandleNpcSetFactionIdCommand,      "" },
-            { "flag",           SEC_GAMEMASTER,     false, &HandleNpcSetFlagCommand,           "" },
-            { "level",          SEC_GAMEMASTER,     false, &HandleNpcSetLevelCommand,          "" },
-            { "link",           SEC_GAMEMASTER,     false, &HandleNpcSetLinkCommand,           "" },
-            { "model",          SEC_GAMEMASTER,     false, &HandleNpcSetModelCommand,          "" },
-            { "movetype",       SEC_GAMEMASTER,     false, &HandleNpcSetMoveTypeCommand,       "" },
-            { "phase",          SEC_GAMEMASTER,     false, &HandleNpcSetPhaseCommand,          "" },
-            { "spawndist",      SEC_GAMEMASTER,     false, &HandleNpcSetSpawnDistCommand,      "" },
-            { "spawntime",      SEC_GAMEMASTER,     false, &HandleNpcSetSpawnTimeCommand,      "" },
+            { "factionid",      SEC_ADMINISTRATOR,  false, &HandleNpcSetFactionIdCommand,      "" },
+            { "flag",           SEC_ADMINISTRATOR,  false, &HandleNpcSetFlagCommand,           "" },
+            { "level",          SEC_ADMINISTRATOR,  false, &HandleNpcSetLevelCommand,          "" },
+            { "link",           SEC_ADMINISTRATOR,  false, &HandleNpcSetLinkCommand,           "" },
+            { "model",          SEC_ADMINISTRATOR,  false, &HandleNpcSetModelCommand,          "" },
+            { "movetype",       SEC_ADMINISTRATOR,  false, &HandleNpcSetMoveTypeCommand,       "" },
+            { "phase",          SEC_ADMINISTRATOR,  false, &HandleNpcSetPhaseCommand,          "" },
+            { "spawndist",      SEC_ADMINISTRATOR,  false, &HandleNpcSetSpawnDistCommand,      "" },
+            { "spawntime",      SEC_ADMINISTRATOR,  false, &HandleNpcSetSpawnTimeCommand,      "" },
             { "data",           SEC_ADMINISTRATOR,  false, &HandleNpcSetDataCommand,           "" },
             //{ TODO: fix or remove these commands
-            { "name",           SEC_GAMEMASTER,     false, &HandleNpcSetNameCommand,           "" },
-            { "subname",        SEC_GAMEMASTER,     false, &HandleNpcSetSubNameCommand,        "" }
+            { "name",           SEC_ADMINISTRATOR,  false, &HandleNpcSetNameCommand,           "" },
+            { "subname",        SEC_ADMINISTRATOR,  false, &HandleNpcSetSubNameCommand,        "" }
             //}
         };
         static std::vector<ChatCommand> npcCommandTable =
         {
-            { "info",           SEC_ADMINISTRATOR,  false, &HandleNpcInfoCommand,              "" },
+            { "info",           SEC_MODERATOR,      false, &HandleNpcInfoCommand,              "" },
             { "near",           SEC_GAMEMASTER,     false, &HandleNpcNearCommand,              "" },
-            { "move",           SEC_GAMEMASTER,     false, &HandleNpcMoveCommand,              "" },
+            { "move",           SEC_ADMINISTRATOR,  false, &HandleNpcMoveCommand,              "" },
             { "playemote",      SEC_ADMINISTRATOR,  false, &HandleNpcPlayEmoteCommand,         "" },
-            { "say",            SEC_GAMEMASTER,      false, &HandleNpcSayCommand,               "" },
-            { "textemote",      SEC_GAMEMASTER,      false, &HandleNpcTextEmoteCommand,         "" },
-            { "whisper",        SEC_GAMEMASTER,      false, &HandleNpcWhisperCommand,           "" },
-            { "yell",           SEC_GAMEMASTER,      false, &HandleNpcYellCommand,              "" },
+            { "say",            SEC_GAMEMASTER,     false, &HandleNpcSayCommand,               "" },
+            { "textemote",      SEC_GAMEMASTER,     false, &HandleNpcTextEmoteCommand,         "" },
+            { "whisper",        SEC_GAMEMASTER,     false, &HandleNpcWhisperCommand,           "" },
+            { "yell",           SEC_GAMEMASTER,     false, &HandleNpcYellCommand,              "" },
             { "tame",           SEC_GAMEMASTER,     false, &HandleNpcTameCommand,              "" },
-            { "add",            SEC_GAMEMASTER,     false, nullptr,                 "", npcAddCommandTable },
-            { "delete",         SEC_GAMEMASTER,     false, nullptr,              "", npcDeleteCommandTable },
-            { "follow",         SEC_GAMEMASTER,     false, nullptr,              "", npcFollowCommandTable },
-            { "set",            SEC_GAMEMASTER,     false, nullptr,                 "", npcSetCommandTable }
+            { "add",            SEC_GAMEMASTER,     false, nullptr,                            "", npcAddCommandTable },
+            { "delete",         SEC_GAMEMASTER,     false, nullptr,                            "", npcDeleteCommandTable },
+            { "follow",         SEC_GAMEMASTER,     false, nullptr,                            "", npcFollowCommandTable },
+            { "set",            SEC_ADMINISTRATOR,  false, nullptr,                            "", npcSetCommandTable }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "npc",            SEC_GAMEMASTER,      false, nullptr,                    "", npcCommandTable }
+            { "npc",            SEC_MODERATOR,      false, nullptr,                            "", npcCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_quest.cpp b/src/scripts/Commands/cs_quest.cpp
index c8e7d51d63..fff4ccf45b 100644
--- a/src/scripts/Commands/cs_quest.cpp
+++ b/src/scripts/Commands/cs_quest.cpp
@@ -26,16 +26,14 @@ public:
     {
         static std::vector<ChatCommand> questCommandTable =
         {
-            { "add",            SEC_ADMINISTRATOR,  false, &HandleQuestAdd,                    "" },
-            { "complete",       SEC_ADMINISTRATOR,  false, &HandleQuestComplete,               "" },
-            { "remove",         SEC_ADMINISTRATOR,  false, &HandleQuestRemove,                 "" },
-            { "reward",         SEC_ADMINISTRATOR,  false, &HandleQuestReward,                 "" },
-            { nullptr,             SEC_PLAYER,         false, nullptr,                               "" }
+            { "add",            SEC_GAMEMASTER,  false, &HandleQuestAdd,                    "" },
+            { "complete",       SEC_GAMEMASTER,  false, &HandleQuestComplete,               "" },
+            { "remove",         SEC_GAMEMASTER,  false, &HandleQuestRemove,                 "" },
+            { "reward",         SEC_GAMEMASTER,  false, &HandleQuestReward,                 "" },
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "quest",          SEC_ADMINISTRATOR,  false, nullptr,                  "", questCommandTable },
-            { nullptr,             SEC_PLAYER,         false, nullptr,                               "" }
+            { "quest",          SEC_GAMEMASTER,  false, nullptr, "", questCommandTable },
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_reload.cpp b/src/scripts/Commands/cs_reload.cpp
index 6c40601510..901b6360b9 100644
--- a/src/scripts/Commands/cs_reload.cpp
+++ b/src/scripts/Commands/cs_reload.cpp
@@ -39,16 +39,16 @@ public:
         static std::vector<ChatCommand> reloadAllCommandTable =
         {
             { "achievement", SEC_ADMINISTRATOR,  true,  &HandleReloadAllAchievementCommand, "" },
-            { "area",       SEC_ADMINISTRATOR,  true,  &HandleReloadAllAreaCommand,       "" },
-            { "gossips",    SEC_ADMINISTRATOR,  true,  &HandleReloadAllGossipsCommand,    "" },
-            { "item",       SEC_ADMINISTRATOR,  true,  &HandleReloadAllItemCommand,       "" },
-            { "locales",    SEC_ADMINISTRATOR,  true,  &HandleReloadAllLocalesCommand,    "" },
-            { "loot",       SEC_ADMINISTRATOR,  true,  &HandleReloadAllLootCommand,       "" },
-            { "npc",        SEC_ADMINISTRATOR,  true,  &HandleReloadAllNpcCommand,        "" },
-            { "quest",      SEC_ADMINISTRATOR,  true,  &HandleReloadAllQuestCommand,      "" },
-            { "scripts",    SEC_ADMINISTRATOR,  true,  &HandleReloadAllScriptsCommand,    "" },
-            { "spell",      SEC_ADMINISTRATOR,  true,  &HandleReloadAllSpellCommand,      "" },
-            { "",           SEC_ADMINISTRATOR,  true,  &HandleReloadAllCommand,           "" }
+            { "area",        SEC_ADMINISTRATOR,  true,  &HandleReloadAllAreaCommand,       "" },
+            { "gossips",     SEC_ADMINISTRATOR,  true,  &HandleReloadAllGossipsCommand,    "" },
+            { "item",        SEC_ADMINISTRATOR,  true,  &HandleReloadAllItemCommand,       "" },
+            { "locales",     SEC_ADMINISTRATOR,  true,  &HandleReloadAllLocalesCommand,    "" },
+            { "loot",        SEC_ADMINISTRATOR,  true,  &HandleReloadAllLootCommand,       "" },
+            { "npc",         SEC_ADMINISTRATOR,  true,  &HandleReloadAllNpcCommand,        "" },
+            { "quest",       SEC_ADMINISTRATOR,  true,  &HandleReloadAllQuestCommand,      "" },
+            { "scripts",     SEC_ADMINISTRATOR,  true,  &HandleReloadAllScriptsCommand,    "" },
+            { "spell",       SEC_ADMINISTRATOR,  true,  &HandleReloadAllSpellCommand,      "" },
+            { "",            SEC_ADMINISTRATOR,  true,  &HandleReloadAllCommand,           "" }
         };
         static std::vector<ChatCommand> reloadCommandTable =
         {
@@ -56,7 +56,7 @@ public:
             { "access_requirement",           SEC_ADMINISTRATOR, true,  &HandleReloadAccessRequirementCommand,          "" },
             { "achievement_criteria_data",    SEC_ADMINISTRATOR, true,  &HandleReloadAchievementCriteriaDataCommand,    "" },
             { "achievement_reward",           SEC_ADMINISTRATOR, true,  &HandleReloadAchievementRewardCommand,          "" },
-            { "all",                          SEC_ADMINISTRATOR, true,  nullptr,                    "", reloadAllCommandTable },
+            { "all",                          SEC_ADMINISTRATOR, true,  nullptr,                                        "", reloadAllCommandTable },
             { "areatrigger_involvedrelation", SEC_ADMINISTRATOR, true,  &HandleReloadQuestAreaTriggersCommand,          "" },
             { "areatrigger_tavern",           SEC_ADMINISTRATOR, true,  &HandleReloadAreaTriggerTavernCommand,          "" },
             { "areatrigger_teleport",         SEC_ADMINISTRATOR, true,  &HandleReloadAreaTriggerTeleportCommand,        "" },
@@ -142,7 +142,7 @@ public:
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "reload",         SEC_ADMINISTRATOR,  true,  nullptr,                 "", reloadCommandTable }
+            { "reload",         SEC_ADMINISTRATOR,  true,  nullptr,                                                     "", reloadCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_reset.cpp b/src/scripts/Commands/cs_reset.cpp
index d05ace9dd3..efeb967442 100644
--- a/src/scripts/Commands/cs_reset.cpp
+++ b/src/scripts/Commands/cs_reset.cpp
@@ -34,11 +34,11 @@ public:
             { "spells",         SEC_ADMINISTRATOR,  true,  &HandleResetSpellsCommand,           "" },
             { "stats",          SEC_ADMINISTRATOR,  true,  &HandleResetStatsCommand,            "" },
             { "talents",        SEC_ADMINISTRATOR,  true,  &HandleResetTalentsCommand,          "" },
-            { "all",            SEC_ADMINISTRATOR,  true,  &HandleResetAllCommand,              "" }
+            { "all",            SEC_CONSOLE,        true,  &HandleResetAllCommand,              "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "reset",          SEC_ADMINISTRATOR,  true, nullptr,                                 "", resetCommandTable }
+            { "reset",          SEC_ADMINISTRATOR,  true, nullptr,                              "", resetCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_server.cpp b/src/scripts/Commands/cs_server.cpp
index dac175f171..c725bcffed 100644
--- a/src/scripts/Commands/cs_server.cpp
+++ b/src/scripts/Commands/cs_server.cpp
@@ -64,19 +64,19 @@ public:
         {
             { "corpses",        SEC_GAMEMASTER,     true,  &HandleServerCorpsesCommand,             "" },
             { "exit",           SEC_CONSOLE,        true,  &HandleServerExitCommand,                "" },
-            { "idlerestart",    SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverIdleRestartCommandTable },
-            { "idleshutdown",   SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverIdleShutdownCommandTable },
+            { "idlerestart",    SEC_ADMINISTRATOR,  true,  nullptr,                                 "", serverIdleRestartCommandTable },
+            { "idleshutdown",   SEC_ADMINISTRATOR,  true,  nullptr,                                 "", serverIdleShutdownCommandTable },
             { "info",           SEC_PLAYER,         true,  &HandleServerInfoCommand,                "" },
             { "motd",           SEC_PLAYER,         true,  &HandleServerMotdCommand,                "" },
-            { "restart",        SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverRestartCommandTable },
-            { "shutdown",       SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverShutdownCommandTable },
-            { "set",            SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverSetCommandTable },
+            { "restart",        SEC_ADMINISTRATOR,  true,  nullptr,                                 "", serverRestartCommandTable },
+            { "shutdown",       SEC_ADMINISTRATOR,  true,  nullptr,                                 "", serverShutdownCommandTable },
+            { "set",            SEC_ADMINISTRATOR,  true,  nullptr,                                 "", serverSetCommandTable },
             { "togglequerylog", SEC_CONSOLE,        true,  &HandleServerToggleQueryLogging,         "" }
         };
 
          static std::vector<ChatCommand> commandTable =
         {
-            { "server",         SEC_ADMINISTRATOR,  true,  nullptr,                                    "", serverCommandTable }
+            { "server",         SEC_PLAYER,         true,  nullptr,                                 "", serverCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/scripts/Commands/cs_spectator.cpp
index e65e5cee50..098f5f333a 100644
--- a/src/scripts/Commands/cs_spectator.cpp
+++ b/src/scripts/Commands/cs_spectator.cpp
@@ -20,16 +20,16 @@ public:
     {
         static std::vector<ChatCommand> spectatorCommandTable =
         {
-            { "version",        SEC_CONSOLE,        false, &HandleSpectatorVersionCommand,    "" },
-            { "reset",          SEC_CONSOLE,        false, &HandleSpectatorResetCommand,      "" },
+            { "version",        SEC_CONSOLE,        false, &HandleSpectatorVersionCommand,                  "" },
+            { "reset",          SEC_CONSOLE,        false, &HandleSpectatorResetCommand,                    "" },
             { "spectate",       SEC_CONSOLE,        false, &ArenaSpectator::HandleSpectatorSpectateCommand, "" },
-            { "watch",          SEC_CONSOLE,        false, &ArenaSpectator::HandleSpectatorWatchCommand, "" },
-            { "leave",          SEC_CONSOLE,        false, &HandleSpectatorLeaveCommand,      "" },
-            { "",               SEC_CONSOLE,        false, &HandleSpectatorCommand,           "" }
+            { "watch",          SEC_CONSOLE,        false, &ArenaSpectator::HandleSpectatorWatchCommand,    "" },
+            { "leave",          SEC_CONSOLE,        false, &HandleSpectatorLeaveCommand,                    "" },
+            { "",               SEC_CONSOLE,        false, &HandleSpectatorCommand,                         "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "spect",          SEC_CONSOLE,        false, nullptr,                              "", spectatorCommandTable }
+            { "spect",          SEC_CONSOLE,        false, nullptr,                                         "", spectatorCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_tele.cpp b/src/scripts/Commands/cs_tele.cpp
index 0dd3d9ab3a..95a1ed5f5e 100644
--- a/src/scripts/Commands/cs_tele.cpp
+++ b/src/scripts/Commands/cs_tele.cpp
@@ -28,15 +28,15 @@ public:
     {
         static std::vector<ChatCommand> teleCommandTable =
         {
-            { "add",            SEC_ADMINISTRATOR,  false, &HandleTeleAddCommand,             "" },
-            { "del",            SEC_ADMINISTRATOR,  true,  &HandleTeleDelCommand,             "" },
+            { "add",            SEC_ADMINISTRATOR,   false, &HandleTeleAddCommand,             "" },
+            { "del",            SEC_ADMINISTRATOR,   true,  &HandleTeleDelCommand,             "" },
             { "name",           SEC_GAMEMASTER,      true,  &HandleTeleNameCommand,            "" },
             { "group",          SEC_GAMEMASTER,      false, &HandleTeleGroupCommand,           "" },
-            { "",               SEC_GAMEMASTER,      false, &HandleTeleCommand,                "" }
+            { "",               SEC_MODERATOR,       false, &HandleTeleCommand,                "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "tele",           SEC_GAMEMASTER,      false, nullptr,                   "", teleCommandTable }
+            { "tele",           SEC_MODERATOR,      false, nullptr,                            "", teleCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_ticket.cpp b/src/scripts/Commands/cs_ticket.cpp
index 5382bcebef..d3b757a68d 100644
--- a/src/scripts/Commands/cs_ticket.cpp
+++ b/src/scripts/Commands/cs_ticket.cpp
@@ -34,26 +34,26 @@ public:
         };
         static std::vector<ChatCommand> ticketCommandTable =
         {
-            { "assign",         SEC_GAMEMASTER,     true,  &HandleGMTicketAssignToCommand,          "" },
+            { "assign",         SEC_GAMEMASTER,      true,  &HandleGMTicketAssignToCommand,          "" },
             { "close",          SEC_GAMEMASTER,      true,  &HandleGMTicketCloseByIdCommand,         "" },
             { "closedlist",     SEC_GAMEMASTER,      true,  &HandleGMTicketListClosedCommand,        "" },
             { "comment",        SEC_GAMEMASTER,      true,  &HandleGMTicketCommentCommand,           "" },
             { "complete",       SEC_GAMEMASTER,      true,  &HandleGMTicketCompleteCommand,          "" },
-            { "delete",         SEC_ADMINISTRATOR,  true,  &HandleGMTicketDeleteByIdCommand,        "" },
+            { "delete",         SEC_ADMINISTRATOR,   true,  &HandleGMTicketDeleteByIdCommand,        "" },
             { "escalate",       SEC_GAMEMASTER,      true,  &HandleGMTicketEscalateCommand,          "" },
-            { "escalatedlist",  SEC_GAMEMASTER,     true,  &HandleGMTicketListEscalatedCommand,     "" },
+            { "escalatedlist",  SEC_GAMEMASTER,      true,  &HandleGMTicketListEscalatedCommand,     "" },
             { "list",           SEC_GAMEMASTER,      true,  &HandleGMTicketListCommand,              "" },
             { "onlinelist",     SEC_GAMEMASTER,      true,  &HandleGMTicketListOnlineCommand,        "" },
-            { "reset",          SEC_ADMINISTRATOR,  true,  &HandleGMTicketResetCommand,             "" },
-            { "response",       SEC_GAMEMASTER,      true,  nullptr,                                    "", ticketResponseCommandTable },
-            { "togglesystem",   SEC_ADMINISTRATOR,  true,  &HandleToggleGMTicketSystem,             "" },
-            { "unassign",       SEC_GAMEMASTER,     true,  &HandleGMTicketUnAssignCommand,          "" },
+            { "reset",          SEC_CONSOLE,         true,  &HandleGMTicketResetCommand,             "" },
+            { "response",       SEC_GAMEMASTER,      true,  nullptr,                                 "", ticketResponseCommandTable },
+            { "togglesystem",   SEC_ADMINISTRATOR,   true,  &HandleToggleGMTicketSystem,             "" },
+            { "unassign",       SEC_GAMEMASTER,      true,  &HandleGMTicketUnAssignCommand,          "" },
             { "viewid",         SEC_GAMEMASTER,      true,  &HandleGMTicketGetByIdCommand,           "" },
             { "viewname",       SEC_GAMEMASTER,      true,  &HandleGMTicketGetByNameCommand,         "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "ticket",         SEC_GAMEMASTER,      false, nullptr,                                    "", ticketCommandTable }
+            { "ticket",         SEC_GAMEMASTER,      false, nullptr,                                 "", ticketCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_titles.cpp b/src/scripts/Commands/cs_titles.cpp
index d5ef8d67c4..a6b83ddfe8 100644
--- a/src/scripts/Commands/cs_titles.cpp
+++ b/src/scripts/Commands/cs_titles.cpp
@@ -33,11 +33,11 @@ public:
             { "add",            SEC_GAMEMASTER,     false, &HandleTitlesAddCommand,            "" },
             { "current",        SEC_GAMEMASTER,     false, &HandleTitlesCurrentCommand,        "" },
             { "remove",         SEC_GAMEMASTER,     false, &HandleTitlesRemoveCommand,         "" },
-            { "set",            SEC_GAMEMASTER,     false, nullptr,              "", titlesSetCommandTable }
+            { "set",            SEC_GAMEMASTER,     false, nullptr,                            "", titlesSetCommandTable }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "titles",         SEC_GAMEMASTER,     false, nullptr,                 "", titlesCommandTable }
+            { "titles",         SEC_GAMEMASTER,     false, nullptr,                            "", titlesCommandTable }
         };
         return commandTable;
     }
diff --git a/src/scripts/Commands/cs_wp.cpp b/src/scripts/Commands/cs_wp.cpp
index 0873fda8c0..cdafdc2f27 100644
--- a/src/scripts/Commands/cs_wp.cpp
+++ b/src/scripts/Commands/cs_wp.cpp
@@ -27,17 +27,17 @@ public:
     {
         static std::vector<ChatCommand> wpCommandTable =
         {
-            { "add",            SEC_GAMEMASTER,     false, &HandleWpAddCommand,                "" },
-            { "event",          SEC_GAMEMASTER,     false, &HandleWpEventCommand,              "" },
-            { "load",           SEC_GAMEMASTER,     false, &HandleWpLoadCommand,               "" },
-            { "modify",         SEC_GAMEMASTER,     false, &HandleWpModifyCommand,             "" },
-            { "unload",         SEC_GAMEMASTER,     false, &HandleWpUnLoadCommand,             "" },
-            { "reload",         SEC_ADMINISTRATOR,  false, &HandleWpReloadCommand,             "" },
-            { "show",           SEC_GAMEMASTER,     false, &HandleWpShowCommand,               "" }
+            { "add",            SEC_ADMINISTRATOR,     false, &HandleWpAddCommand,                "" },
+            { "event",          SEC_ADMINISTRATOR,     false, &HandleWpEventCommand,              "" },
+            { "load",           SEC_ADMINISTRATOR,     false, &HandleWpLoadCommand,               "" },
+            { "modify",         SEC_ADMINISTRATOR,     false, &HandleWpModifyCommand,             "" },
+            { "unload",         SEC_ADMINISTRATOR,     false, &HandleWpUnLoadCommand,             "" },
+            { "reload",         SEC_ADMINISTRATOR,     false, &HandleWpReloadCommand,             "" },
+            { "show",           SEC_ADMINISTRATOR,     false, &HandleWpShowCommand,               "" }
         };
         static std::vector<ChatCommand> commandTable =
         {
-            { "wp",             SEC_GAMEMASTER,     false, nullptr,                     "", wpCommandTable }
+            { "wp",             SEC_ADMINISTRATOR,     false, nullptr,                            "", wpCommandTable }
         };
         return commandTable;
     }