2 files changed, 7 insertions, 9 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index f9180a7d8..264eca1ad 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,13 +22,10 @@
 
 #include "net/tmwa/adminhandler.h"
 
-#include "const/gui/chat.h"
-
-#include "net/chathandler.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocolout.h"
 
+#include "utils/gmfunctions.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
@@ -76,8 +73,8 @@ void AdminHandler::kickAll() const
 
 void AdminHandler::warp(const std::string &map, const int x, const int y) const
 {
-    chatHandler->talk(strprintf(
-        "@warp %s %d %d", map.c_str(), x, y), GENERAL_CHANNEL);
+    Gm::runCommand("warp",
+        strprintf("%s %d %d", map.c_str(), x, y));
 }
 
 void AdminHandler::resetStats() const
@@ -90,12 +87,12 @@ void AdminHandler::resetSkills() const
 
 void AdminHandler::gotoName(const std::string &name) const
 {
-    chatHandler->talk("@goto " + name, GENERAL_CHANNEL);
+    Gm::runCommand("goto", name);
 }
 
 void AdminHandler::recallName(const std::string &name) const
 {
-    chatHandler->talk("@recall " + name, GENERAL_CHANNEL);
+    Gm::runCommand("recall", name);
 }
 
 void AdminHandler::mute(const Being *const being A_UNUSED,
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index da25c83cf..514b339c8 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -33,6 +33,7 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocolout.h"
 
+#include "utils/gmfunctions.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
@@ -86,7 +87,7 @@ void ChatHandler::channelMessage(const std::string &restrict channel,
     if (channel == TRADE_CHANNEL)
         talk("\302\202" + text, GENERAL_CHANNEL);
     else if (channel == GM_CHANNEL)
-        talk("@wgm " + text, GENERAL_CHANNEL);
+        Gm::runCommand("wgm", text);
 }
 
 void ChatHandler::who() const