diff --git a/src/main/resources/META-INF/resources/app.js b/src/main/resources/META-INF/resources/app.js
index 61bf66d..2e3ddb4 100644
--- a/src/main/resources/META-INF/resources/app.js
+++ b/src/main/resources/META-INF/resources/app.js
@@ -181,12 +181,6 @@ document.addEventListener("DOMContentLoaded", async () => {
 
     document.getElementById('chatOverlayLink').href = url() + '/chatoverlay'
 
-    document.addEventListener("DOMContentLoaded", async () => {
-        if (!localStorage.getItem("userId")) {
-            localStorage.setItem("userId", self.crypto.randomUUID());
-        }
-    })
-
     configurePopover();
 })
 
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 00399d2..575a1d8 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -29,6 +29,11 @@
     <meta property="twitter:domain" content="{http:request.authority}">
 </head>
 <body class="w3-theme-l1">
+<script>
+    if (!localStorage.getItem("userId")) {
+        localStorage.setItem("userId", self.crypto.randomUUID());
+    }
+</script>
 <div class="w3-container w3-content"
      style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
     <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
