diff --git a/src/aoclient.cpp b/src/aoclient.cpp
index dd8b02f..7dcbff3 100644
--- a/src/aoclient.cpp
+++ b/src/aoclient.cpp
@@ -434,18 +434,18 @@ void AOClient::calculateIpid()
 
 void AOClient::sendServerMessage(QString message)
 {
-    sendPacket("CT", {ConfigManager::serverName(), message, "1"});
+    sendPacket("CT", {ConfigManager::serverTag(), message, "1"});
 }
 
 void AOClient::sendServerMessageArea(QString message)
 {
-    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverName(), message, "1"}),
+    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), message, "1"}),
                       areaId());
 }
 
 void AOClient::sendServerBroadcast(QString message)
 {
-    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverName(), message, "1"}));
+    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), message, "1"}));
 }
 
 bool AOClient::checkPermission(ACLRole::Permission f_permission) const
diff --git a/src/commands/area.cpp b/src/commands/area.cpp
index 92435fc..7b1276c 100644
--- a/src/commands/area.cpp
+++ b/src/commands/area.cpp
@@ -349,7 +349,7 @@ void AOClient::cmdBgLock(int argc, QStringList argv)
         l_area->toggleBgLock();
     };
 
-    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverName(), character() + " locked the background.", "1"}), areaId());
+    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), character() + " locked the background.", "1"}), areaId());
 }
 
 void AOClient::cmdBgUnlock(int argc, QStringList argv)
@@ -363,7 +363,7 @@ void AOClient::cmdBgUnlock(int argc, QStringList argv)
         l_area->toggleBgLock();
     };
 
-    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverName(), character() + " unlocked the background.", "1"}), areaId());
+    server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), character() + " unlocked the background.", "1"}), areaId());
 }
 
 void AOClient::cmdStatus(int argc, QStringList argv)
@@ -375,7 +375,7 @@ void AOClient::cmdStatus(int argc, QStringList argv)
 
     if (l_area->changeStatus(l_arg)) {
         arup(ARUPType::STATUS, true);
-        server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverName(), character() + " changed status to " + l_arg.toUpper(), "1"}), areaId());
+        server->broadcast(PacketFactory::createPacket("CT", {ConfigManager::serverTag(), character() + " changed status to " + l_arg.toUpper(), "1"}), areaId());
     }
     else {
         const QStringList keys = AreaData::map_statuses.keys();
diff --git a/src/config_manager.cpp b/src/config_manager.cpp
index c754b5a..92a286a 100644
--- a/src/config_manager.cpp
+++ b/src/config_manager.cpp
@@ -340,6 +340,11 @@ QString ConfigManager::serverName()
     return m_settings->value("Options/server_name", "An Unnamed Server").toString();
 }
 
+QString ConfigManager::serverTag()
+{
+    return m_settings->value("Options/server_tag", serverName()).toString();
+}
+
 QString ConfigManager::motd()
 {
     return m_settings->value("Options/motd", "MOTD not set").toString();
diff --git a/src/config_manager.h b/src/config_manager.h
index 9106a6d..888e6ba 100644
--- a/src/config_manager.h
+++ b/src/config_manager.h
@@ -157,6 +157,13 @@ class ConfigManager
      */
     static QString serverName();
 
+    /**
+     * @brief Returns the short "tag" version of the server.
+     *
+     * @return See short description.
+     */
+    static QString serverTag();
+
     /**
      * @brief Returns the server's Message of the Day.
      *