diff --git a/instance.ts b/instance.ts
index 96f3888..6da5a51 100644
--- a/instance.ts
+++ b/instance.ts
@@ -64,11 +64,11 @@ export default async function(context: InstancePluginContext) {
             queue.push({datetime: dt, message: `**\`${message_username}\`**: ${message_content}`});
         } else if (ACTION_VERBS[action]) {
             const action_verb = ACTION_VERBS[action];
-            const name = message.toLowerCase().endsWith(action_verb)
-                ? message.slice(0, -action_verb.length).trim()
-                : message;
+            const message_index = message.indexOf(' ');
+            const message_username = message_index === -1 ? message.trim() : message.slice(0, message_index);
+            const player_count = instance.playersOnline.size + (action === 'JOIN' ? 0 : -1);
 
-            queue.push({datetime: dt, message: `**\`${name}\`** ${action_verb} ${message} (${instance.playersOnline.size})`});
+            queue.push({datetime: dt, message: `**\`${message_username}\`** ${action_verb} ${message} (${player_count})`});
         } else {
             queue.push({datetime: dt, message: `unknown action ${action} ${message}`});
         }
diff --git a/package.json b/package.json
index 387273c..960f9ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@phidias0303/chat_relay",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "One way chat relay to Discord",
   "author": "PHIDIAS <phidias@aperx.org>",
   "license": "MIT",