diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.kt b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.kt
index 2ef83e482af3..89f5f8f5c65d 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.kt
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.kt
@@ -937,6 +937,17 @@ open class AuthenticatorActivity :
             return createAccount(result)
         }
 
+        val existingLoginName = account?.let { AccountUtils.getUsernameForAccount(it) }
+        if (existingLoginName != null && !existingLoginName.equals(webViewUser, ignoreCase = true)) {
+            Log_OC.w(TAG, "Account: login name does not match ${account?.name}, credentials not updated")
+            authStatus = AuthenticatorStatus(
+                R.drawable.ic_alert,
+                getString(R.string.auth_login_name_mismatch, existingLoginName)
+            )
+            showAuthStatus()
+            return false
+        }
+
         return try {
             updateAccountAuthentication()
             true
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02ad7b2f9b0c..1cf35021d86f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -456,6 +456,7 @@
     <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
     <string name="auth_fail_get_user_name">Your server is not returning a correct user ID, please contact an admin.</string>
     <string name="auth_account_does_not_exist">The account is not added on this device yet</string>
+    <string name="auth_login_name_mismatch">Log in with %1$s to update this account</string>
     <string name="auth_access_failed">Access failed: %1$s</string>
 
     <string name="authenticator_activity_empty_response_message">Unable to fetch login details. Please try again.</string>