diff --git a/client/app/pages/preferences.vue b/client/app/pages/preferences.vue
index 1451269..f45a2ed 100644
--- a/client/app/pages/preferences.vue
+++ b/client/app/pages/preferences.vue
@@ -8,7 +8,7 @@
         <label for="username">Username</label>
       </PrimeFloatLabel>
 
-      <PrimeButton label="Save" type="submit" />
+      <PrimeButton label="Save" type="submit" :disabled="!localUsername || localUsername === username" />
     </form>
   </div>
 </template>
@@ -25,11 +25,14 @@ const toast = useToast()
 const localUsername = ref(username.value)
 
 async function save() {
-  if (localUsername.value && localUsername.value !== username.value) {
-    username.value = localUsername.value
+  if (!localUsername.value || localUsername.value === username.value)
+    return
 
-    await signaling.socket.value?.emitWithAck('updateClient', { username })
-  }
+  username.value = localUsername.value
+
+  await signaling.socket.value?.emitWithAck('updateClient', {
+    username: username.value,
+  })
 
   toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
 }
diff --git a/server/sockets/webrtc.ts b/server/sockets/webrtc.ts
index d4b9e9a..df44b5b 100644
--- a/server/sockets/webrtc.ts
+++ b/server/sockets/webrtc.ts
@@ -432,7 +432,7 @@ export default function (io: SocketServer, router: types.Router) {
 
       cb({ ok: true })
 
-      socket.broadcast.emit('clientChanged', socket.id, socketToClient(socket))
+      namespace.emit('clientChanged', socket.id, socketToClient(socket))
     })
 
     socket.on('disconnect', () => {