diff --git a/src/app/commoncomponents/ModalTextEdit.qml b/src/app/commoncomponents/ModalTextEdit.qml
index 7c0fe051b9558442c59c6dd7baf46460a99b75cb..33bbb24a371d79bb4cb62e69cf922e9711682c6c 100644
--- a/src/app/commoncomponents/ModalTextEdit.qml
+++ b/src/app/commoncomponents/ModalTextEdit.qml
@@ -99,7 +99,7 @@ Loader {
             inputIsValid: root.inputIsValid
             onFocusChanged: {
                 if (!focus && root.editMode) {
-                    root.editMode = false
+                    root.editMode = isPersistent
                     root.accepted()
                 }
                 activeChanged(root.editMode)
diff --git a/src/libclient/accountmodel.cpp b/src/libclient/accountmodel.cpp
index 48a825dfd2a025201f8042e7b6c4467e2b6503ba..1dd57e88ccb98e4bc82bc6e5ca09adb213bebfa5 100644
--- a/src/libclient/accountmodel.cpp
+++ b/src/libclient/accountmodel.cpp
@@ -270,11 +270,12 @@ AccountModel::setAccountConfig(const QString& accountId,
             finalCred.append(credMap);
         }
 
-        VectorMapStringString oldCredentials = ConfigurationManager::instance().getCredentials(accountId);
-        if (oldCredentials.empty() || finalCred.empty() ||
-            oldCredentials[0][ConfProperties::PASSWORD] != finalCred[0][ConfProperties::PASSWORD] ||
-            oldCredentials[0][ConfProperties::REALM] != finalCred[0][ConfProperties::REALM] ||
-            oldCredentials[0][ConfProperties::USERNAME] != finalCred[0][ConfProperties::USERNAME])
+        VectorMapStringString oldCredentials = ConfigurationManager::instance().getCredentials(
+            accountId);
+        if (oldCredentials.empty() || finalCred.empty()
+            || oldCredentials[0][ConfProperties::PASSWORD] != finalCred[0][ConfProperties::PASSWORD]
+            || oldCredentials[0][ConfProperties::REALM] != finalCred[0][ConfProperties::REALM]
+            || oldCredentials[0][ConfProperties::USERNAME] != finalCred[0][ConfProperties::USERNAME])
             ConfigurationManager::instance().setCredentials(accountId, finalCred);
         details[ConfProperties::USERNAME] = confProperties.username;
         accountInfo.confProperties.credentials.swap(credentialsVec);
@@ -297,8 +298,6 @@ AccountModel::setAlias(const QString& accountId, const QString& alias)
     accountInfo.profileInfo.alias = alias;
 
     authority::storage::createOrUpdateProfile(accountInfo.id, accountInfo.profileInfo);
-
-    Q_EMIT profileUpdated(accountId);
 }
 
 void
@@ -823,7 +822,7 @@ account::Info::fromDetails(const MapStringString& details)
     profileInfo.alias = details[ConfProperties::DISPLAYNAME];
     enabled = toBool(details[ConfProperties::ENABLED]);
     status = lrc::api::account::to_status(
-                volatileDetails[libjami::Account::ConfProperties::Registration::STATUS]);
+        volatileDetails[libjami::Account::ConfProperties::Registration::STATUS]);
     confProperties.mailbox = details[ConfProperties::MAILBOX];
     confProperties.dtmfType = details[ConfProperties::DTMF_TYPE];
     confProperties.autoAnswer = toBool(details[ConfProperties::AUTOANSWER]);