diff --git a/src/Access/IAccessStorage.cpp b/src/Access/IAccessStorage.cpp
index b21527e48f1..8dd219e07d7 100644
--- a/src/Access/IAccessStorage.cpp
+++ b/src/Access/IAccessStorage.cpp
@@ -421,14 +421,15 @@ UUID IAccessStorage::login(
     const String & password,
     const Poco::Net::IPAddress & address,
     const ExternalAuthenticators & external_authenticators,
-    bool log_and_mask_exceptions) const
+    bool replace_exception_with_cannot_authenticate) const
 {
-    try {
+    try
+    {
         return loginImpl(user_name, password, address, external_authenticators);
     }
     catch (...)
     {
-        if (!log_and_mask_exceptions)
+        if (!replace_exception_with_cannot_authenticate)
             throw;
 
         tryLogCurrentException(getLogger(), user_name + ": Authentication failed");
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index 93c97144cda..ecf6b260712 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -144,7 +144,7 @@ public:
 
     /// Finds an user, check its password and returns the ID of the user.
     /// Throws an exception if no such user or password is incorrect.
-    UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool log_and_mask_exceptions = true) const;
+    UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool replace_exception_with_cannot_authenticate = true) const;
 
     /// Returns the ID of an user who has logged in (maybe on another node).
     /// The function assumes that the password has been already checked somehow, so we can skip checking it now.
diff --git a/src/Access/MultipleAccessStorage.cpp b/src/Access/MultipleAccessStorage.cpp
index 32aa8c50159..6f888f2f150 100644
--- a/src/Access/MultipleAccessStorage.cpp
+++ b/src/Access/MultipleAccessStorage.cpp
@@ -409,7 +409,7 @@ UUID MultipleAccessStorage::loginImpl(const String & user_name, const String & p
     {
         try
         {
-            auto id = storage->login(user_name, password, address, external_authenticators, false);
+            auto id = storage->login(user_name, password, address, external_authenticators, /* replace_exception_with_cannot_authenticate = */ false);
             std::lock_guard lock{mutex};
             ids_cache.set(id, storage);
             return id;