diff --git a/src/Api/Controllers/CollectionsController.cs b/src/Api/Controllers/CollectionsController.cs
index 56d35f1a91..1a95ea358c 100644
--- a/src/Api/Controllers/CollectionsController.cs
+++ b/src/Api/Controllers/CollectionsController.cs
@@ -121,8 +121,11 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
 
+            var assignUserToCollection = !(await _currentContext.EditAnyCollection(orgIdGuid)) &&
+                await _currentContext.EditAssignedCollections(orgIdGuid);
+
             await _collectionService.SaveAsync(collection, model.Groups?.Select(g => g.ToSelectionReadOnly()),
-                !await _currentContext.ViewAllCollections(orgIdGuid) ? _currentContext.UserId : null);
+                assignUserToCollection ? _currentContext.UserId : null);
             return new CollectionResponseModel(collection);
         }
 
diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs
index 633b3cbfdd..7956726a83 100644
--- a/src/Core/Context/CurrentContext.cs
+++ b/src/Core/Context/CurrentContext.cs
@@ -292,7 +292,7 @@ namespace Bit.Core.Context
 
         public async Task<bool> CreateNewCollections(Guid orgId)
         {
-            return await OrganizationAdmin(orgId) || (Organizations?.Any(o => o.Id == orgId
+            return await OrganizationManager(orgId) || (Organizations?.Any(o => o.Id == orgId
                         && (o.Permissions?.CreateNewCollections ?? false)) ?? false);
         }