diff --git a/src/modules/users.js b/src/modules/users.js
index 22e0133c..b68f67e6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -24,7 +24,7 @@ export const mutations = {
     set(user, 'muted', muted)
   },
   setCurrentUser (state, user) {
-    state.currentUser = user
+    state.currentUser = merge(state.currentUser || {}, user)
   },
   beginLogin (state) {
     state.loggingIn = true