diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index aff5141..e48ede8 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -428,10 +428,7 @@ export default {
               console.log(
                 "CreateRoom: Set display name to: " + this.selectedProfile.name
               );
-              return this.$matrix.matrixClient.setDisplayName(
-                this.selectedProfile.name,
-                undefined
-              );
+              return this.$matrix.setUserDisplayName(this.selectedProfile.name);
             }
           }.bind(this)
         )
diff --git a/src/components/Join.vue b/src/components/Join.vue
index c5548d5..e796b27 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -371,7 +371,7 @@ export default {
               return Promise.resolve(user);
             } else {
               console.log("Join: Set display name to: " + this.selectedProfile.name);
-              return this.$matrix.matrixClient.setDisplayName(this.selectedProfile.name, undefined);
+              return this.$matrix.setUserDisplayName(this.selectedProfile.name);
             }
           }.bind(this)
         )
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 4757e2a..2d68219 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -69,7 +69,7 @@
       <ActionRow
         @click="showEditPasswordDialog = true"
         :icon="'$vuetify.icons.password'"
-        :text="$t('profile.set_password')"
+        :text="$matrix.currentUser.is_guest ? $t('profile.set_password') : $t('profile.change_password')"
       />
       <ActionRow
         @click="
@@ -93,7 +93,7 @@
       :width="$vuetify.breakpoint.smAndUp ? '940px' : '80%'"
     >
       <v-card :disabled="settingPassword">
-        <v-card-title>{{ $t("profile.change_password") }}</v-card-title>
+        <v-card-title>{{ $matrix.currentUser.is_guest ? $t("profile.set_password") : $t("profile.change_password") }}</v-card-title>
         <v-card-text>
           <v-text-field
             v-if="!$matrix.currentUser.is_guest"
@@ -232,42 +232,6 @@ export default {
   },
 
   computed: {
-    user() {
-      if (!this.$matrix.matrixClient) {
-        return null;
-      }
-      return this.$matrix.matrixClient.getUser(this.$matrix.currentUserId);
-    },
-
-    displayName() {
-      if (!this.user) {
-        return null;
-      }
-      return this.user.displayName || this.user.userId;
-    },
-
-    userAvatar() {
-      if (!this.user || !this.user.avatarUrl) {
-        return null;
-      }
-      return this.$matrix.matrixClient.mxcUrlToHttp(
-        this.user.avatarUrl,
-        80,
-        80,
-        "scale",
-        true
-      );
-    },
-
-    userAvatarLetter() {
-      if (!this.user) {
-        return null;
-      }
-      return (this.user.displayName || this.user.userId.substring(1))
-        .substring(0, 1)
-        .toUpperCase();
-    },
-
     passwordsMatch() {
       return (
         !this.newPasswordHasError &&
diff --git a/src/components/profileInfoMixin.js b/src/components/profileInfoMixin.js
index 7a9dd35..d0627dc 100644
--- a/src/components/profileInfoMixin.js
+++ b/src/components/profileInfoMixin.js
@@ -12,7 +12,7 @@ export default {
         if (!this.user) {
           return null;
         }
-        return this.user.displayName;
+        return this.$matrix.userDisplayName || this.user.displayName;
       },
       set(newValue) {
         this.user.displayName = newValue
@@ -20,17 +20,17 @@ export default {
     },
 
     userAvatar() {
-      if (!this.user || !this.user.avatarUrl) {
+      if (!this.$matrix.userAvatar) {
         return null;
       }
-      return this.$matrix.matrixClient.mxcUrlToHttp(this.user.avatarUrl, 80, 80, 'scale', true);
+      return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, 'scale', true);
     },
 
     userAvatarLetter() {
       if (!this.user) {
         return null;
       }
-      return (this.user.displayName || this.user.userId.substring(1)).substring(0, 1).toUpperCase();
+      return (this.$matrix.userDisplayName || this.user.displayName || this.user.userId.substring(1)).substring(0, 1).toUpperCase();
     },
 
     passwordsMatch() {
@@ -46,7 +46,7 @@ export default {
       })
     },
     updateDisplayName(name) {
-      this.$matrix.matrixClient.setDisplayName(name || this.user.userId);
+      this.$matrix.setUserDisplayName(name || this.user.userId);
     }
   }
 }
\ No newline at end of file
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 658f9bf..08bc79c 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -946,6 +946,14 @@ export default {
           }
         },
 
+        setUserDisplayName(name) {
+          if (this.matrixClient) {
+            return this.matrixClient.setDisplayName(name || this.user.userId).then(() => this.userDisplayName = name).catch(err => console.err("Failed to set display name", err));
+          } else {
+            return Promise.reject("No matrix client");
+          }
+        },
+
         setPassword(oldPassword, newPassword) {
           if (this.matrixClient && this.currentUser) {
             const authDict = {