2 files changed, 2 insertions, 2 deletions

diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index d9d0741d..5ade461b 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -50,7 +50,7 @@ Rectangle {
             placeholderText: accountName
             Layout.fillWidth: true
             text: maildirSettings.accountName
-            onTextChanged: { maildirSettings.accountName = text; }
+            onTextChanged: { maildirSettings.accountName = text; root.accountName = text; }
         }
 
         Label { text: "User Name" }
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index a20078dc..897942d8 100644
--- a/components/package/contents/ui/Settings.qml
+++ b/components/package/contents/ui/Settings.qml
@@ -117,7 +117,7 @@ Rectangle {
                                 }
 
                                 Label {
-                                    text: accountFactory.name
+                                    text: model.name === "" ? accountFactory.name : model.name
                                 }
                             }
                         }