diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index 7a4df63c17a..704fba3b3ef 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -47,7 +47,8 @@ public:
     String current_user;
     String current_query_id;
     Poco::Net::SocketAddress current_address;
-    /// Use current user and password when sending query to replica leader
+
+    /// This field is only used in foreign "Arcadia" build.
     String current_password;
 
     /// When query_kind == INITIAL_QUERY, these values are equal to current.
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index cb780443e03..02060534aef 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -660,9 +660,13 @@ void Context::setUser(const String & name, const String & password, const Poco::
     auto lock = getLock();
 
     client_info.current_user = name;
-    client_info.current_password = password;
     client_info.current_address = address;
 
+#if defined(ARCADIA_BUILD)
+    /// This is harmful field that is used only in foreign "Arcadia" build.
+    client_info.current_password = password;
+#endif
+
     auto new_user_id = getAccessControlManager().find<User>(name);
     std::shared_ptr<const ContextAccess> new_access;
     if (new_user_id)