diff --git a/chromium_src/chrome/browser/importer/importer_list.cc b/chromium_src/chrome/browser/importer/importer_list.cc
index db14a03e410c..c5e6e49a816c 100644
--- a/chromium_src/chrome/browser/importer/importer_list.cc
+++ b/chromium_src/chrome/browser/importer/importer_list.cc
@@ -34,12 +34,6 @@ void AddChromeToProfiles(std::vector<importer::SourceProfile>* profiles,
                                      profile->begin(), profile->end())),
                                  &items))
       continue;
-#if BUILDFLAG(IS_MAC)
-    // https://github.com/brave/brave-browser/issues/24130
-    if (type == importer::TYPE_OPERA && (items & importer::PASSWORDS)) {
-      items ^= importer::PASSWORDS;
-    }
-#endif
     importer::SourceProfile chrome;
     std::string importer_name(brand);
     importer_name.append(*name);
diff --git a/chromium_src/components/os_crypt/keychain_password_mac.mm b/chromium_src/components/os_crypt/keychain_password_mac.mm
index 9c9842fb4417..0d6a76d5df3e 100644
--- a/chromium_src/components/os_crypt/keychain_password_mac.mm
+++ b/chromium_src/components/os_crypt/keychain_password_mac.mm
@@ -33,10 +33,16 @@
   if (command_line->HasSwitch("import-chrome")) {
     service_name = std::string("Chrome Safe Storage");
     account_name = std::string("Chrome");
+  } else if (command_line->HasSwitch("import-vivaldi")) {
+    service_name = std::string("Vivaldi Safe Storage");
+    account_name = std::string("Vivaldi");
   } else if (command_line->HasSwitch("import-chromium") ||
              command_line->HasSwitch("import-brave")) {
     service_name = std::string("Chromium Safe Storage");
     account_name = std::string("Chromium");
+  } else if (command_line->HasSwitch("import-opera")) {
+    service_name = std::string("Opera Safe Storage");
+    account_name = std::string("Opera");
   } else {
     service_name = std::string(kBraveDefaultServiceName);
     account_name = std::string(kBraveDefaultAccountName);
diff --git a/utility/importer/brave_profile_import_impl.cc b/utility/importer/brave_profile_import_impl.cc
index 0c96bd21fbb6..16be3fec2845 100644
--- a/utility/importer/brave_profile_import_impl.cc
+++ b/utility/importer/brave_profile_import_impl.cc
@@ -18,6 +18,7 @@
 #include "brave/utility/importer/brave_external_process_importer_bridge.h"
 #include "brave/utility/importer/chrome_importer.h"
 #include "build/build_config.h"
+#include "chrome/common/importer/importer_type.h"
 #include "chrome/common/importer/profile_import.mojom.h"
 #include "chrome/utility/importer/external_process_importer_bridge.h"
 #include "chrome/utility/importer/importer.h"
@@ -65,6 +66,10 @@ void BraveProfileImportImpl::StartImport(
   } else if (base::StartsWith(base::UTF16ToUTF8(source_profile.importer_name),
                               "Chromium", base::CompareCase::SENSITIVE)) {
     command_line->AppendSwitch("import-chromium");
+  } else if (source_profile.importer_type == importer::TYPE_OPERA) {
+    command_line->AppendSwitch("import-opera");
+  } else if (source_profile.importer_type == importer::TYPE_VIVALDI) {
+    command_line->AppendSwitch("import-vivaldi");
   }
 
   content::UtilityThread::Get()->EnsureBlinkInitialized();