diff --git a/src/main/kotlin/civilengineering/eventhandlers/CommandEventHandler.kt b/src/main/kotlin/civilengineering/eventhandlers/CommandEventHandler.kt
index 914fea1..204f26e 100644
--- a/src/main/kotlin/civilengineering/eventhandlers/CommandEventHandler.kt
+++ b/src/main/kotlin/civilengineering/eventhandlers/CommandEventHandler.kt
@@ -30,9 +30,10 @@ class CommandEventHandler {
                 message = message + " " + word
             }
             message = message.trim { it <= ' ' }
+            val name: String = if(event.sender.name.equals("@")) "CommandBlock" else event.sender.name
 
             MessageHandler.transmit(ApiMessage(
-                    username = event.sender.name,
+                    username = name,
                     text = message
             ))
         }