diff --git a/package.json b/package.json
index 578c7a8..c86cb22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "frontend",
-    "version": "5.3.2",
+    "version": "5.3.3",
     "description": "React frontend for the Cards 110",
     "author": "Daithi Hearn",
     "license": "MIT",
diff --git a/public/manifest.json b/public/manifest.json
index 34b3139..eb27c09 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "short_name": "Cards 110",
   "name": "Cards 110",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "icons": [
     {
       "src": "./assets/favicon.png",
diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index 63f2398..bcc5404 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -1,6 +1,7 @@
 export const FormatName = (name: string) =>
     name
-        .split(" ")
+        .split("@")[0]
+        .split(RegExp("[ .,]+"))
         .map(word =>
             word.length < 3
                 ? word