diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index 506e5356edb8..a011da9f62e3 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -227,7 +227,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     net::features::kFirstPartySets.name,
     network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
-    password_manager::features::kEnablePasswordsAccountStorage.name,
     reading_list::switches::kReadLater.name,
 #if defined(OS_ANDROID)
     features::kWebNfc.name,
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 9abd3a4bd0ff..52402edf0532 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -93,7 +93,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &net::features::kFirstPartySets,
       &network::features::kTrustTokens,
       &network_time::kNetworkTimeServiceQuerying,
-      &password_manager::features::kEnablePasswordsAccountStorage,
       &reading_list::switches::kReadLater,
   };
 
diff --git a/chromium_src/components/password_manager/core/browser/sync_credentials_filter.cc b/chromium_src/components/password_manager/core/browser/sync_credentials_filter.cc
new file mode 100644
index 000000000000..cd1d0585c17f
--- /dev/null
+++ b/chromium_src/components/password_manager/core/browser/sync_credentials_filter.cc
@@ -0,0 +1,22 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "components/password_manager/core/browser/sync_credentials_filter.h"
+
+#define ShouldSave ShouldSave_ChromiumImpl
+#include "../../../../../../components/password_manager/core/browser/sync_credentials_filter.cc"
+#undef ShouldSave
+
+namespace password_manager {
+
+bool SyncCredentialsFilter::ShouldSave(const PasswordForm& form) const {
+  bool should_save = ShouldSave_ChromiumImpl(form);
+  if (!should_save && sync_util::IsGaiaCredentialPage(form.signon_realm)) {
+    return true;
+  }
+  return should_save;
+}
+
+}  // namespace password_manager
diff --git a/chromium_src/components/password_manager/core/browser/sync_credentials_filter.h b/chromium_src/components/password_manager/core/browser/sync_credentials_filter.h
new file mode 100644
index 000000000000..e71e455e6335
--- /dev/null
+++ b/chromium_src/components/password_manager/core/browser/sync_credentials_filter.h
@@ -0,0 +1,19 @@
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_SYNC_CREDENTIALS_FILTER_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_SYNC_CREDENTIALS_FILTER_H_
+
+#include "components/password_manager/core/browser/credentials_filter.h"
+
+#define ShouldSave                                         \
+  ShouldSave_ChromiumImpl(const PasswordForm& form) const; \
+  bool ShouldSave
+
+#include "../../../../../../components/password_manager/core/browser/sync_credentials_filter.h"
+
+#undef ShouldSave
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_SYNC_CREDENTIALS_FILTER_H_