diff --git a/client/src/pages/setup.vue b/client/src/pages/setup.vue
index a8ab567..7f1c51e 100644
--- a/client/src/pages/setup.vue
+++ b/client/src/pages/setup.vue
@@ -15,7 +15,7 @@
           <div class="page-setup__auth-message">{{ $t('remember-and-log-in') }}</div>
           <template v-slot:footer>
             <div class="page-setup__cta">
-              <Button @click="createAdminAccount">{{ $t('complete-setup') }}</Button>
+              <Button @click="createAdminAccount" :disabled="saveInProgress">{{ $t('complete-setup') }}</Button>
             </div>
           </template>
         </ModalDialog>
@@ -43,6 +43,7 @@ const { $t } = useI18n({
 await useAuth().authenticateAndLoadUserInfo(['setup'])
 
 const showAdminAccountCreatedDialog = ref(false)
+const saveInProgress = ref(false)
 const authcode = ref('000000')
 const openModal = () => {
   authcode.value = ''
@@ -50,10 +51,15 @@ const openModal = () => {
     authcode.value += '' + Math.floor(Math.floor(Math.random() * 10000) / 100) % 10
   }
   showAdminAccountCreatedDialog.value = true
+  saveInProgress.value = false
 }
 
-const createAdminAccount = () => {
-  useEngine().setupApp(authcode.value)
+const createAdminAccount = async () => {
+  saveInProgress.value = true
+  await useEngine().setupApp(authcode.value)
+  saveInProgress.value = false
+  showAdminAccountCreatedDialog.value = false
+  document.location.pathname = "/"
 }
 </script>
 
diff --git a/server/src/application/createUser.go b/server/src/application/createUser.go
index 0bce4e9..a324e12 100644
--- a/server/src/application/createUser.go
+++ b/server/src/application/createUser.go
@@ -32,6 +32,10 @@ func (app *Application) createUser(gm *game.Game, name, role, authcode string) (
 		return "", err
 	}
 	app.users[newUser.GetId()] = newUser
-	gm.AddPlayer(newUser)
+
+	if gm != nil {
+		gm.AddPlayer(newUser)
+	}
+
 	return newUser.GetId(), nil
 }