diff --git a/core/include/server.h b/core/include/server.h
index d6c86f8..0c47b99 100644
--- a/core/include/server.h
+++ b/core/include/server.h
@@ -75,6 +75,14 @@ class Server : public QObject {
      */
     void start();
 
+    /**
+     * @brief Enum to specifc different targets to send altered packets to a specific usergroup.
+     */
+    enum class TARGET_TYPE {
+        AUTHENTICATED
+    };
+    Q_ENUM(TARGET_TYPE)
+
     /**
      * @brief Gets a pointer to a client by IPID.
      *
@@ -129,6 +137,14 @@ class Server : public QObject {
      */
     void broadcast(AOPacket packet);
 
+    /**
+     * @brief Sends a packet to clients, sends an altered packet to a specific usergroup.
+     * @param The packet to send to the clients.
+     * @param The altered packet to send to the other clients.
+     * @param tENUM to determine the targets of the altered packet.
+     */
+    void broadcast(AOPacket packet, AOPacket other_packet, enum TARGET_TYPE target);
+
     /**
      * @brief Returns the character's character ID (= their index in the character list).
      *
diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp
index 7582501..356743c 100644
--- a/core/src/commands/messaging.cpp
+++ b/core/src/commands/messaging.cpp
@@ -71,10 +71,9 @@ void AOClient::cmdG(int argc, QStringList argv)
     QString l_sender_name = m_ooc_name;
     QString l_sender_area = server->m_area_names.value(m_current_area);
     QString l_sender_message = argv.join(" ");
-    for (AOClient* l_client : qAsConst(server->m_clients)) {
-        if (l_client->m_global_enabled)
-            l_client->sendPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message});
-    }
+    AOPacket l_packet = AOPacket("CT", {"[G][" + m_ipid + "][" + l_sender_area + "]" + l_sender_name, l_sender_message});
+    AOPacket l_other_packet = AOPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message});
+    server->broadcast(l_packet, l_other_packet, Server::TARGET_TYPE::AUTHENTICATED);
     return;
 }
 
diff --git a/core/src/server.cpp b/core/src/server.cpp
index 46741bb..a93d2a8 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -215,6 +215,21 @@ void Server::broadcast(AOPacket packet)
     }
 }
 
+void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE target)
+{
+    switch (target) {
+    case TARGET_TYPE::AUTHENTICATED:
+        for (AOClient* client : qAsConst(m_clients)){
+            if (client->m_authenticated) {
+                client->sendPacket(other_packet);
+            }
+            else {
+                client->sendPacket(packet);
+            }
+        }
+    }
+}
+
 QList<AOClient*> Server::getClientsByIpid(QString ipid)
 {
     QList<AOClient*> return_clients;