diff --git a/src/layouts/app/auth-mixin.js b/src/layouts/app/auth-mixin.js
index 17929fb6f9..89ebe3ed13 100644
--- a/src/layouts/app/auth-mixin.js
+++ b/src/layouts/app/auth-mixin.js
@@ -11,6 +11,11 @@ export default superClass => class extends superClass {
     // HACK :( We don't have a way yet to trigger an update of `subscribeUser`
     this.addEventListener('hass-refresh-current-user', () =>
       getUser(this.hass.connection).then(user => this._updateHass({ user })));
+  }
+
+  hassConnected() {
+    super.hassConnected();
+    subscribeUser(this.hass.connection, user => this._updateHass({ user }));
 
     afterNextRender(null, () => {
       if (askWrite()) {
@@ -22,11 +27,6 @@ export default superClass => class extends superClass {
     });
   }
 
-  hassConnected() {
-    super.hassConnected();
-    subscribeUser(this.hass.connection, user => this._updateHass({ user }));
-  }
-
   _handleLogout() {
     this.hass.connection.close();
     clearState();