diff --git a/src/qml/Settings/AccountEditorPage.qml b/src/qml/Settings/AccountEditorPage.qml
index beebef282..bf7661846 100644
--- a/src/qml/Settings/AccountEditorPage.qml
+++ b/src/qml/Settings/AccountEditorPage.qml
@@ -22,6 +22,7 @@ Kirigami.ScrollablePage {
                 Kirigami.Avatar {
                     id: avatar
                     source: root.connection && root.connection.localUser.avatarMediaId ? ("image://mxc/" + root.connection.localUser.avatarMediaId) : ""
+                    name: root.connection.localUser.displayName ?? root.connection.localUser.id
 
                     MouseArea {
                         id: mouseArea
diff --git a/src/qml/Settings/AccountsPage.qml b/src/qml/Settings/AccountsPage.qml
index e826bc5a9..665a9b8d6 100644
--- a/src/qml/Settings/AccountsPage.qml
+++ b/src/qml/Settings/AccountsPage.qml
@@ -27,7 +27,12 @@ Kirigami.ScrollablePage {
             text: model.connection.localUser.displayName
             labelItem.textFormat: Text.PlainText
             subtitle: model.connection.localUserId
-            icon: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : "im-user"
+
+            leading: Kirigami.Avatar {
+                name: model.connection.localUser.displayName ?? model.connection.localUser.id
+                source: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : ""
+                width: height
+            }
 
             onClicked: {
                 Controller.activeConnection = model.connection;