diff --git a/src/Core/Repositories/ICipherRepository.cs b/src/Core/Repositories/ICipherRepository.cs
index 1c9c6429cd..960ff23a4d 100644
--- a/src/Core/Repositories/ICipherRepository.cs
+++ b/src/Core/Repositories/ICipherRepository.cs
@@ -23,8 +23,8 @@ namespace Bit.Core.Repositories
         Task UpdatePartialAsync(Guid id, Guid userId, Guid? folderId, bool favorite);
         Task UpdateAttachmentAsync(CipherAttachment attachment);
         Task DeleteAttachmentAsync(Guid cipherId, string attachmentId);
-        Task DeleteAsync(Cipher obj, bool permanent = false);
-        Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = false);
+        Task DeleteAsync(Cipher obj, bool permanent = true);
+        Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = true);
         Task MoveAsync(IEnumerable<Guid> ids, Guid? folderId, Guid userId);
         Task DeleteByUserIdAsync(Guid userId);
         Task DeleteByOrganizationIdAsync(Guid organizationId);
diff --git a/src/Core/Repositories/SqlServer/CipherRepository.cs b/src/Core/Repositories/SqlServer/CipherRepository.cs
index d3d86385fb..83cb1c3b13 100644
--- a/src/Core/Repositories/SqlServer/CipherRepository.cs
+++ b/src/Core/Repositories/SqlServer/CipherRepository.cs
@@ -215,9 +215,9 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task DeleteAsync(Cipher obj, bool permanent = false)
+        public async Task DeleteAsync(Cipher obj, bool permanent = true)
         {
-            using (var connection = new SqlConnection(ConnectionString))
+            using(var connection = new SqlConnection(ConnectionString))
             {
                 var results = await connection.ExecuteAsync(
                     $"[{Schema}].[Cipher_DeleteById]",
@@ -226,7 +226,7 @@ namespace Bit.Core.Repositories.SqlServer
             }
         }
 
-        public async Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = false)
+        public async Task DeleteAsync(IEnumerable<Guid> ids, Guid userId, bool permanent = true)
         {
             using(var connection = new SqlConnection(ConnectionString))
             {
diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql
index 66ff8693ec..54f69d169b 100644
--- a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserId.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql
index cf887cfa94..3154e632c1 100644
--- a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql b/src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql
index 96ea8ef222..e0b5ffb578 100644
--- a/src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/CipherOrganizationDetails_ReadById.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
     @Id UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_Delete.sql b/src/Sql/dbo/Stored Procedures/Cipher_Delete.sql
index ee4ab9798a..8f0b410674 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_Delete.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_Delete.sql	
@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Cipher_Delete]
     @Ids AS [dbo].[GuidIdArray] READONLY,
     @UserId AS UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql
index 3fe46671ff..be361755c4 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_DeleteById]
     @Id UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 WITH RECOMPILE
 AS
 BEGIN
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql
index 2284881eb0..8d91863fc5 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadByOrganizationId.sql	
@@ -1,6 +1,6 @@
 CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
     @OrganizationId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Tables/Cipher.sql b/src/Sql/dbo/Tables/Cipher.sql
index 2265c88819..81c3c8adbd 100644
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@@ -19,7 +19,7 @@
 GO
 CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
     ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
-    INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate]);
+    INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate], [DeletedDate]);
 
 
 GO
diff --git a/util/Migrator/DbScripts/2020-03-26_00_CipherSoftDelete.sql b/util/Migrator/DbScripts/2020-03-26_00_CipherSoftDelete.sql
index 7e500c4def..c1a983c78e 100644
--- a/util/Migrator/DbScripts/2020-03-26_00_CipherSoftDelete.sql
+++ b/util/Migrator/DbScripts/2020-03-26_00_CipherSoftDelete.sql
@@ -67,7 +67,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -96,7 +96,7 @@ GO
 
 CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
     @OrganizationId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -124,7 +124,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherOrganizationDetails_ReadById]
     @Id UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -157,7 +157,7 @@ GO
 
 CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserId]
     @UserId UNIQUEIDENTIFIER,
-    @Deleted BIT = 0
+    @Deleted BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -181,7 +181,7 @@ GO
 CREATE PROCEDURE [dbo].[Cipher_Delete]
     @Ids AS [dbo].[GuidIdArray] READONLY,
     @UserId AS UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 AS
 BEGIN
     SET NOCOUNT ON
@@ -282,7 +282,7 @@ GO
 
 CREATE PROCEDURE [dbo].[Cipher_DeleteById]
     @Id UNIQUEIDENTIFIER,
-    @Permanent AS BIT = 0
+    @Permanent AS BIT
 WITH RECOMPILE
 AS
 BEGIN
@@ -481,3 +481,11 @@ BEGIN
     EXECUTE sp_refreshsqlmodule N'[dbo].[Cipher_UpdateWithCollections]';
 END
 GO
+
+DROP INDEX IF EXISTS [IX_Cipher_UserId_OrganizationId_IncludeAll]
+    ON [dbo].[Cipher];
+GO
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
+    ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
+    INCLUDE([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate], [DeletedDate]);
+GO
diff --git a/util/Migrator/Migrator.csproj b/util/Migrator/Migrator.csproj
index 4c2c22355e..9d07c45865 100644
--- a/util/Migrator/Migrator.csproj
+++ b/util/Migrator/Migrator.csproj
@@ -9,10 +9,6 @@
     <EmbeddedResource Include="DbScripts\**\*.sql" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="DbScripts\2020-03-26_00_CipherSoftDelete.sql" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="dbup-sqlserver" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />