set cipher id to limit collection scope

src/Core/Services/Implementations/CipherService.cs

@@ -63,6 +63,7 @@ namespace Bit.Core.Services
                 throw new BadRequestException("You do not have permissions to edit this.");
             }
 
+            cipher.UserId = savingUserId;
             if(cipher.Id == default(Guid))
             {
                 if(cipher.OrganizationId.HasValue && collectionIds != null)

src/Sql/dbo/Stored Procedures/Cipher_Update.sql

@@ -16,7 +16,7 @@ BEGIN
     UPDATE
         [dbo].[Cipher]
     SET
-        [UserId] = @UserId,
+        [UserId] = CASE WHEN @OrganizationId IS NULL THEN @UserId ELSE NULL END,
         [OrganizationId] = @OrganizationId,
         [Type] = @Type,
         [Data] = @Data,