diff --git a/src/Sql/dbo/Tables/CollectionGroup.sql b/src/Sql/dbo/Tables/CollectionGroup.sql
index 72a6710e2a..9a28d68344 100644
--- a/src/Sql/dbo/Tables/CollectionGroup.sql
+++ b/src/Sql/dbo/Tables/CollectionGroup.sql
@@ -15,3 +15,8 @@ CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId
     INCLUDE (ReadOnly, HidePasswords, Manage)
 
 GO
+
+CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
+  ON dbo.CollectionGroup (GroupId, ReadOnly)
+  INCLUDE (CollectionId);
+GO
diff --git a/src/Sql/dbo/Tables/CollectionUser.sql b/src/Sql/dbo/Tables/CollectionUser.sql
index afdb0f84a0..5af93ca730 100644
--- a/src/Sql/dbo/Tables/CollectionUser.sql
+++ b/src/Sql/dbo/Tables/CollectionUser.sql
@@ -15,3 +15,8 @@ CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId
     INCLUDE (ReadOnly, HidePasswords, Manage)
 
 GO
+CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
+  ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
+  INCLUDE (CollectionId);
+
+GO
diff --git a/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql b/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql
index a6e7ce1038..3697a7367c 100644
--- a/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql	
+++ b/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql	
@@ -87,19 +87,3 @@ BEGIN
     ORDER BY
         ST.CreationDate DESC;
 END
-GO
-
-CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
-  ON dbo.CollectionGroup (GroupId, ReadOnly)
-  INCLUDE (CollectionId);
-GO
-
-CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
-  ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
-  INCLUDE (CollectionId);
-GO
-
-CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
-  ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
-  INCLUDE (CipherId, [Type], RevisionDate);
-GO
diff --git a/src/Sql/dbo/Vault/Tables/SecurityTask.sql b/src/Sql/dbo/Vault/Tables/SecurityTask.sql
index a00dcede9c..6cf9a3bf17 100644
--- a/src/Sql/dbo/Vault/Tables/SecurityTask.sql
+++ b/src/Sql/dbo/Vault/Tables/SecurityTask.sql
@@ -19,3 +19,8 @@ CREATE NONCLUSTERED INDEX [IX_SecurityTask_CipherId]
 GO
 CREATE NONCLUSTERED INDEX [IX_SecurityTask_OrganizationId]
     ON [dbo].[SecurityTask]([OrganizationId] ASC) WHERE OrganizationId IS NOT NULL;
+
+CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
+  ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
+  INCLUDE (CipherId, [Type], RevisionDate);
+GO