diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index cdc63085..4dff2519 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -227,12 +227,6 @@ class AccountActivity : AppCompatActivity() {
                 val au = authUser.text.toString().trim()
                 val ap = authPass.text.toString().trim()
 
-                if ((au == "") && (ap != "")) {
-                    Utils.alertView(this, getString(R.string.notice),
-                            getString(R.string.authentication_username_password_mismatch))
-                    return false
-                }
-
                 if (au != acc.authUser) {
                     if (checkAuthUser(au)) {
                         if (account_set_auth_user(acc.accp, au) == 0) {
@@ -249,24 +243,31 @@ class AccountActivity : AppCompatActivity() {
                     }
                 }
 
-                if ((ap != acc.authPass) && (ap != "")) {
-                    if (Utils.checkPrintAscii(ap) && (ap.length <= 64)) {
-                        if (account_set_auth_pass(acc.accp, ap) == 0) {
-                            acc.authPass = account_auth_pass(acc.accp)
-                            MainActivity.aorPasswords.remove(aor)
-                            // Log.d("Baresip", "New auth password is ${acc.authPass}")
-                            save = true
+                if (ap != acc.authPass) {
+                    if (ap != "") {
+                        if (Utils.checkPrintAscii(ap) && (ap.length <= 64)) {
+                            if (account_set_auth_pass(acc.accp, ap) == 0) {
+                                acc.authPass = account_auth_pass(acc.accp)
+                                MainActivity.aorPasswords.remove(aor)
+                                // Log.d("Baresip", "New auth password is ${acc.authPass}")
+                                save = true
+                            } else {
+                                Log.e("Baresip", "Setting of auth pass failed")
+                            }
                         } else {
-                            Log.e("Baresip", "Setting of auth pass failed")
+                            Utils.alertView(this, getString(R.string.notice),
+                                    String.format(getString(R.string.invalid_authentication_password), ap))
+                            return false
                         }
                     } else {
-                        Utils.alertView(this, getString(R.string.notice),
-                                String.format(getString(R.string.invalid_authentication_password), ap))
-                        return false
+                        if ((au != "") && !MainActivity.aorPasswords.containsKey(aor)) {
+                            MainActivity.aorPasswords.put(aor, acc.authPass)
+                            save = true
+                        }
                     }
                 } else {
-                    if ((ap == "") && !MainActivity.aorPasswords.containsKey(aor)) {
-                        MainActivity.aorPasswords.put(aor, acc.authPass)
+                    if (MainActivity.aorPasswords.containsKey(aor)) {
+                        MainActivity.aorPasswords.remove(aor)
                         save = true
                     }
                 }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 4f848545..1403c1d5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -38,12 +38,11 @@
     <string name="display_name_help">Tilin käyttäjän nimi, joka esiintyy
         SIP-sanomien From URI:ssa (vapaaehtoinen).</string>
     <string name="invalid_display_name">Virheellinen tilin käyttäjän nimi \'%1$s\'</string>
-    <string name="authentication_username_password_mismatch">Salasanaa ei
-    voi antaa ilman käyttäjätunnusta.
-    </string>
     <string name="authentication_username">Käyttäjätunnus</string>
     <string name="authentication_username_help">Todentamiseen käytettävä
-    käyttäjätunnus, jos välityspalvelin vaatii sellaisen.</string>
+    käyttäjätunnus, jos välityspalvelin vaatii sellaisen. Oletusarvo on
+    tilin käyttäjätunnus.
+    </string>
     <string name="invalid_authentication_username">Virheellinen käyttäjätunnus \'%1$s\'</string>
     <string name="authentication_password">Salasana</string>
     <string name="authentication_password_help">Todentamiseen käytettävä
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1206d59f..b72d673e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,11 +41,9 @@
     <string name="your_name">Your Name</string>
     <string name="display_name_help">Name (if any) used in From URI of outbound requests.</string>
     <string name="invalid_display_name">Invalid Display Name \'%1$s\'</string>
-    <string name="authentication_username_password_mismatch">Authentication Password cannot be given without Authentication Username.
-    </string>
     <string name="authentication_username">Authentication Username</string>
-    <string name="authentication_username_help">Authentication username if authentication of SIP
-        requests is required.
+    <string name="authentication_username_help">Authentication username
+    if authentication of SIP requests is required.  Default value is account\'s username.
     </string>
     <string name="invalid_authentication_username">Invalid Authentication Username \'%1$s\'</string>
     <string name="authentication_password">Authentication Password</string>