diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index 01b7373489..c8788a3d7f 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -67,117 +67,117 @@
     <Folder Include="dbo\User Defined Types\" />
   </ItemGroup>
   <ItemGroup>
-    <Build Include="dbo\Tables\Device.sql" />
-    <Build Include="dbo\Tables\Cipher.sql" />
-    <Build Include="dbo\Tables\Organization.sql" />
-    <Build Include="dbo\Tables\Grant.sql" />
-    <Build Include="dbo\Tables\Group.sql" />
-    <Build Include="dbo\Tables\User.sql" />
-    <Build Include="dbo\Tables\GroupUser.sql" />
-    <Build Include="dbo\Tables\Folder.sql" />
-    <Build Include="dbo\Tables\OrganizationUser.sql" />
-    <Build Include="dbo\Tables\Subvault.sql" />
     <Build Include="dbo\Tables\SubvaultCipher.sql" />
     <Build Include="dbo\Tables\SubvaultGroup.sql" />
     <Build Include="dbo\Tables\SubvaultUser.sql" />
-    <Build Include="dbo\Views\SubvaultUserView.sql" />
-    <Build Include="dbo\Views\DeviceView.sql" />
-    <Build Include="dbo\Views\OrganizationView.sql" />
-    <Build Include="dbo\Views\FolderView.sql" />
+    <Build Include="dbo\Tables\User.sql" />
+    <Build Include="dbo\Tables\OrganizationUser.sql" />
+    <Build Include="dbo\Tables\Cipher.sql" />
+    <Build Include="dbo\Tables\Device.sql" />
+    <Build Include="dbo\Tables\Folder.sql" />
+    <Build Include="dbo\Tables\Grant.sql" />
+    <Build Include="dbo\Tables\Group.sql" />
+    <Build Include="dbo\Tables\GroupUser.sql" />
+    <Build Include="dbo\Tables\Organization.sql" />
+    <Build Include="dbo\Tables\Subvault.sql" />
     <Build Include="dbo\Views\CipherView.sql" />
-    <Build Include="dbo\Views\OrganizationUserView.sql" />
-    <Build Include="dbo\Views\UserView.sql" />
-    <Build Include="dbo\Views\SubvaultUserSubvaultDetailsView.sql" />
+    <Build Include="dbo\Views\DeviceView.sql" />
+    <Build Include="dbo\Views\FolderView.sql" />
     <Build Include="dbo\Views\GrantView.sql" />
-    <Build Include="dbo\Views\SubvaultUserUserDetailsView.sql" />
     <Build Include="dbo\Views\OrganizationUserOrganizationDetailsView.sql" />
     <Build Include="dbo\Views\OrganizationUserUserDetailsView.sql" />
+    <Build Include="dbo\Views\OrganizationUserView.sql" />
+    <Build Include="dbo\Views\OrganizationView.sql" />
+    <Build Include="dbo\Views\SubvaultUserSubvaultDetailsView.sql" />
+    <Build Include="dbo\Views\SubvaultUserUserDetailsView.sql" />
+    <Build Include="dbo\Views\SubvaultUserView.sql" />
     <Build Include="dbo\Views\SubvaultView.sql" />
+    <Build Include="dbo\Views\UserView.sql" />
     <Build Include="dbo\Functions\UserCanEditCipher.sql" />
     <Build Include="dbo\Functions\CipherDetails.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserIdCipherId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadByOrganizationUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenByIdentifier.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByTypeUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserIdHasSubvault.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\User_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\User_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\User_UpdateEmailPassword.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_Update.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_Create.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithSubvaults.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaults.sql" />
+    <Build Include="dbo\Stored Procedures\User_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
+    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\User_Create.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUserUserDetails_ReadBySubvaultId.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUserSubvaultDetails_ReadByUserId.sql" />
     <Build Include="dbo\Stored Procedures\SubvaultUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CipherFullDetails_ReadByIdUserId.sql" />
     <Build Include="dbo\Stored Procedures\SubvaultUser_ReadCanEditByCipherIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaultsAdmin.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaults.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserIdCipherId.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\SubvaultCipher_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_Create.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
     <Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUserSubvaultDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUserUserDetails_ReadBySubvaultId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientIdType.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_ReadBySubjectId.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
     <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
-    <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_ReadBySubjectId.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientIdType.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientId.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenByIdentifier.sql" />
+    <Build Include="dbo\Stored Procedures\CipherFullDetails_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserIdHasSubvault.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByTypeUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithSubvaults.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaultsAdmin.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
+    <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sql/dbo/Functions/CipherDetails.sql b/src/Sql/dbo/Functions/CipherDetails.sql
index d1c3d3b180..098cf121e3 100644
--- a/src/Sql/dbo/Functions/CipherDetails.sql
+++ b/src/Sql/dbo/Functions/CipherDetails.sql
@@ -21,4 +21,4 @@ SELECT
     ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
     END [FolderId]
 FROM
-    [dbo].[Cipher] C
+    [dbo].[Cipher] C
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql
index 672368e39d..ca6f39a346 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
@@ -29,4 +29,4 @@ BEGIN
     BEGIN
         EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
     END
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Folder_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Folder_ReadByUserId.sql
index 79f3aa50f7..1244383ed7 100644
--- a/src/Sql/dbo/Stored Procedures/Folder_ReadByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Folder_ReadByUserId.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[FolderView]
     WHERE
         [UserId] = @UserId
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Organization_Create.sql b/src/Sql/dbo/Stored Procedures/Organization_Create.sql
index 0212e1da4d..6e93749ec0 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_Create.sql	
@@ -48,4 +48,4 @@ BEGIN
         @CreationDate,
         @RevisionDate
     )
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Organization_Update.sql b/src/Sql/dbo/Stored Procedures/Organization_Update.sql
index 1773e95cea..76636c4d63 100644
--- a/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Organization_Update.sql	
@@ -34,4 +34,4 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDate.sql b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDate.sql
index fe10429880..f17407b510 100644
--- a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDate.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDate.sql	
@@ -10,4 +10,4 @@ BEGIN
         [AccountRevisionDate] = GETUTCDATE()
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationId.sql
index d2a7ca7672..a25d5b37d6 100644
--- a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationId.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationId.sql	
@@ -15,4 +15,4 @@ BEGIN
     WHERE
         OU.[OrganizationId] = @OrganizationId
         AND OU.[Status] = 2 -- Confirmed
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserId.sql b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserId.sql
index 4e793439b1..36a2064cbf 100644
--- a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserId.sql	
@@ -15,4 +15,4 @@ BEGIN
     WHERE
         OU.[Id] = @OrganizationUserId
         AND OU.[Status] = 2 -- Confirmed
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_DeleteById.sql b/src/Sql/dbo/Stored Procedures/User_DeleteById.sql
index b6caa221c5..9ceac60338 100644
--- a/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
@@ -36,4 +36,4 @@ BEGIN
         [Id] = @Id
 
     COMMIT TRANSACTION User_DeleteById
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql
index b7dab1dc4c..24a50b28b2 100644
--- a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql	
@@ -1,4 +1,5 @@
-CREATE PROCEDURE [dbo].[User_ReadAccountRevisionDateById]
+
+CREATE PROCEDURE [dbo].[User_ReadAccountRevisionDateById]
     @Id UNIQUEIDENTIFIER
 AS
 BEGIN
diff --git a/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql b/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql
index fa368af81a..06d16d8d86 100644
--- a/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql	
@@ -22,4 +22,4 @@ BEGIN
         [AccountRevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Tables/Cipher.sql b/src/Sql/dbo/Tables/Cipher.sql
index 0a75c3a4e8..c1f96bc7e1 100644
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@@ -14,11 +14,11 @@
 
 
 GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type]
-    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC);
+CREATE NONCLUSTERED INDEX [IX_Cipher_OrganizationId_Type]
+    ON [dbo].[Cipher]([OrganizationId] ASC, [Type] ASC) WHERE ([OrganizationId] IS NOT NULL);
 
 
 GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_OrganizationId_Type]
-    ON [dbo].[Cipher]([OrganizationId] ASC, [Type] ASC)
-    WHERE [OrganizationId] IS NOT NULL;
\ No newline at end of file
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type]
+    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC);
+
diff --git a/src/Sql/dbo/Tables/OrganizationUser.sql b/src/Sql/dbo/Tables/OrganizationUser.sql
index 4ba27ef0e1..ed7c0ce2f4 100644
--- a/src/Sql/dbo/Tables/OrganizationUser.sql
+++ b/src/Sql/dbo/Tables/OrganizationUser.sql
@@ -1,14 +1,14 @@
 CREATE TABLE [dbo].[OrganizationUser] (
-    [Id]                    UNIQUEIDENTIFIER NOT NULL,
-    [OrganizationId]        UNIQUEIDENTIFIER NOT NULL,
-    [UserId]                UNIQUEIDENTIFIER NULL,
-    [Email]                 NVARCHAR (50)    NULL,
-    [Key]                   VARCHAR (MAX)    NULL,
-    [Status]                TINYINT          NOT NULL,
-    [Type]                  TINYINT          NOT NULL,
-    [AccessAllSubvaults]    BIT              NOT NULL,
-    [CreationDate]          DATETIME2 (7)    NOT NULL,
-    [RevisionDate]          DATETIME2 (7)    NOT NULL,
+    [Id]                 UNIQUEIDENTIFIER NOT NULL,
+    [OrganizationId]     UNIQUEIDENTIFIER NOT NULL,
+    [UserId]             UNIQUEIDENTIFIER NULL,
+    [Email]              NVARCHAR (50)    NULL,
+    [Key]                VARCHAR (MAX)    NULL,
+    [Status]             TINYINT          NOT NULL,
+    [Type]               TINYINT          NOT NULL,
+    [AccessAllSubvaults] BIT              NOT NULL,
+    [CreationDate]       DATETIME2 (7)    NOT NULL,
+    [RevisionDate]       DATETIME2 (7)    NOT NULL,
     CONSTRAINT [PK_OrganizationUser] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_OrganizationUser_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE,
     CONSTRAINT [FK_OrganizationUser_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
diff --git a/src/Sql/dbo/Views/FolderView.sql b/src/Sql/dbo/Views/FolderView.sql
index 4a6fc91581..959248e302 100644
--- a/src/Sql/dbo/Views/FolderView.sql
+++ b/src/Sql/dbo/Views/FolderView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[Folder]
+    [dbo].[Folder]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/UserView.sql b/src/Sql/dbo/Views/UserView.sql
index 82fa8a2c63..c8b77385a9 100644
--- a/src/Sql/dbo/Views/UserView.sql
+++ b/src/Sql/dbo/Views/UserView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[User]
+    [dbo].[User]
\ No newline at end of file