diff --git a/src/utils/github-user-utils.ts b/src/utils/github-user-utils.ts
index 3b57dbc..26b68e7 100644
--- a/src/utils/github-user-utils.ts
+++ b/src/utils/github-user-utils.ts
@@ -1,12 +1,13 @@
 import { Database } from '../shared/Database';
 
-const mentionRegex = new RegExp('@([\\S]+)', 'gi');
+const mentionRegex = new RegExp('@([\\S]+),|@([\\S]+)', 'gi');
 
 export async function fixPings(body: string): Promise<string> {
   const mappings = await Database.getAllGithubUserMappings();
 
-  return body.replaceAll(mentionRegex, (match, username) => {
-    const mapping = mappings.find(m => m.github_username == username);
+  return body.replaceAll(mentionRegex, (match, m1, m2) => {
+    const name = m1 ?? m2;
+    const mapping = mappings.find(m => m.github_username == name);
 
     return mapping ? `<@${mapping.discord_id}>` : match;
   });