diff --git a/src/index.ts b/src/index.ts
index f603859..6e4e509 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -16,13 +16,13 @@ client.on("messageCreate", async (message: Message) => {
   
   if (message.author?.bot) {}
   else {
-      if (message?.content.startsWith(config.prefix)) {
-	commandHandler(message, config.prefix);
-      }
-      else {
-	nonCommandHandler(message);
-      }
+    if (message?.content.startsWith(config.prefix)) {
+      commandHandler(message, config.prefix);
     }
+    else {
+      nonCommandHandler(message);
+    }
+  }
 });
 
 client.loginBot(config.botKey);
diff --git a/src/utils/nonCommandHandler.ts b/src/utils/nonCommandHandler.ts
index e9b4f5b..6443639 100644
--- a/src/utils/nonCommandHandler.ts
+++ b/src/utils/nonCommandHandler.ts
@@ -29,7 +29,7 @@ export async function nonCommandHandler(message : Message){
 	await message.channel.sendMessage({
 	  content: actualContent,
 	  masquerade: {
-	    name: alter.name,
+	    name: alter.name + " ( " + message.author.id + " )",
 	    avatar: alter.profile_pic_url,
 	    color: alter.color
 	  },