diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt
index 4a9c9187551..53343ca9d7d 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt
@@ -80,11 +80,6 @@ class AutofillProcessorImpl(
             return
         }
 
-        if (policyManager.getActivePolicies(PolicyType.ORGANIZATION_DATA_OWNERSHIP).any()) {
-            saveCallback.onSuccess()
-            return
-        }
-
         request
             .fillContexts
             .lastOrNull()
diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
index 6ef3d7394b9..15bb851eed1 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
@@ -245,6 +245,7 @@ fun List<CollectionView>.getDefaultCollectionViewOrNull(
 ): CollectionView? =
     if (isIndividualVaultDisabled) {
         firstOrNull { it.type == CollectionType.DEFAULT_USER_COLLECTION }
+            ?: firstOrNull { !it.readOnly }
     } else {
         null
     }