diff --git a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
index 67a1fa8ebdd..356de561435 100644
--- a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
+++ b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
@@ -564,15 +564,18 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
         // Get the existing primary providers since we don't touch them in
         // this part of the UI we should just copy them over.
         Set<String> primaryServices = new HashSet<>();
+        List<String> enabledServices = getEnabledSettings();
         for (CredentialProviderInfo service : mServices) {
             if (service.isPrimary()) {
-                primaryServices.add(service.getServiceInfo().getComponentName().flattenToString());
+                String flattened = service.getServiceInfo().getComponentName().flattenToString();
+                primaryServices.add(flattened);
+                enabledServices.add(flattened);
             }
         }
 
         mCredentialManager.setEnabledProviders(
                 new ArrayList<>(primaryServices),
-                getEnabledSettings(),
+                enabledServices,
                 getUser(),
                 mExecutor,
                 new OutcomeReceiver<Void, SetEnabledProvidersException>() {
diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
index 793aa3c1cbe..634be4c09e8 100644
--- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
+++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
@@ -369,6 +369,8 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
             }
         }
 
+        credManProviders.addAll(primaryCredManProviders);
+
         service.setEnabledProviders(
                 primaryCredManProviders,
                 credManProviders,