diff --git a/src/Sql/dbo/Tables/Cipher.sql b/src/Sql/dbo/Tables/Cipher.sql
index 46b4b40949..0dead7a54e 100644
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@@ -14,8 +14,8 @@
 
 
 GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_UserId]
-    ON [dbo].[Cipher]([UserId] ASC);
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type]
+    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC);
 
 
 GO
diff --git a/src/Sql/dbo/Tables/Device.sql b/src/Sql/dbo/Tables/Device.sql
index d3c60d8c74..a274521de3 100644
--- a/src/Sql/dbo/Tables/Device.sql
+++ b/src/Sql/dbo/Tables/Device.sql
@@ -12,11 +12,6 @@
 );
 
 
-GO
-CREATE NONCLUSTERED INDEX [IX_Device_UserId]
-    ON [dbo].[Device]([UserId] ASC);
-
-
 GO
 CREATE UNIQUE NONCLUSTERED INDEX [UX_Device_UserId_Identifier]
     ON [dbo].[Device]([UserId] ASC, [Identifier] ASC);