diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index 91ad02949e..d7fb61420b 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -65,34 +65,34 @@
     <Folder Include="dbo\Stored Procedures\" />
   </ItemGroup>
   <ItemGroup>
-    <Build Include="dbo\Tables\History.sql" />
     <Build Include="dbo\Tables\Cipher.sql" />
     <Build Include="dbo\Tables\Device.sql" />
+    <Build Include="dbo\Tables\History.sql" />
     <Build Include="dbo\Tables\User.sql" />
     <Build Include="dbo\Views\CipherView.sql" />
-    <Build Include="dbo\Views\HistoryView.sql" />
     <Build Include="dbo\Views\DeviceView.sql" />
+    <Build Include="dbo\Views\HistoryView.sql" />
     <Build Include="dbo\Views\UserView.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\Cipher_Update.sql" />
-    <Build Include="dbo\Stored Procedures\History_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadByTypeUserId.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_ReadByRevisionDateUserWithDeleteHistory.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
-    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\User_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadByTypeUserId.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\User_UpdateEmailPassword.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_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\Device_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
+    <Build Include="dbo\Stored Procedures\History_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_Create.sql" />
+    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_UpdateEmailPassword.sql" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_Create.sql b/src/Sql/dbo/Stored Procedures/Cipher_Create.sql
index 3eef16597f..4c7894909a 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_Create.sql	
@@ -33,4 +33,4 @@ BEGIN
         @CreationDate,
         @RevisionDate
     )
-END
+END
\ 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 e431cfd7ab..2e4d0f44a6 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_DeleteById.sql	
@@ -21,4 +21,4 @@ BEGIN
         [Id] = @Id
 
     COMMIT TRANSACTION Cipher_DeleteById
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_ReadById.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadById.sql
index 66ea3bceb8..0b87bf013c 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadById.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[CipherView]
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_ReadByRevisionDateUserWithDeleteHistory.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadByRevisionDateUserWithDeleteHistory.sql
index 8f5d2df1f8..64640d46b6 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_ReadByRevisionDateUserWithDeleteHistory.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadByRevisionDateUserWithDeleteHistory.sql	
@@ -21,4 +21,4 @@ BEGIN
         [Date] > @SinceRevisionDate
         AND [Event] = 2 -- Only cipher delete events.
         AND [UserId] = @UserId
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_ReadByTypeUserId.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadByTypeUserId.sql
index 9e7d8ce652..5d3f3bd0a3 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_ReadByTypeUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadByTypeUserId.sql	
@@ -12,4 +12,4 @@ BEGIN
     WHERE
         [Type] = @Type
         AND [UserId] = @UserId
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql
index 18bc10285b..b04592c220 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[CipherView]
     WHERE
         [UserId] = @UserId
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_Update.sql b/src/Sql/dbo/Stored Procedures/Cipher_Update.sql
index ff3d23ae91..19190a73c6 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_Update.sql	
@@ -23,4 +23,4 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql
index b5086eb7e8..333ec87461 100644
--- a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql	
@@ -10,4 +10,4 @@ BEGIN
         [PushToken] = NULL
     WHERE
         [Identifier] = @Identifier
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_Create.sql b/src/Sql/dbo/Stored Procedures/Device_Create.sql
index 25ee051d46..cad719d7af 100644
--- a/src/Sql/dbo/Stored Procedures/Device_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_Create.sql	
@@ -33,4 +33,4 @@ BEGIN
         @CreationDate,
         @RevisionDate
     )
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Device_DeleteById.sql
index 83b9cee439..ab1996ceb8 100644
--- a/src/Sql/dbo/Stored Procedures/Device_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_DeleteById.sql	
@@ -9,4 +9,4 @@ BEGIN
         [dbo].[Device]
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_ReadById.sql b/src/Sql/dbo/Stored Procedures/Device_ReadById.sql
index 9910ee42f0..3ac06a507c 100644
--- a/src/Sql/dbo/Stored Procedures/Device_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_ReadById.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[DeviceView]
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_ReadByIdentifierUserId.sql b/src/Sql/dbo/Stored Procedures/Device_ReadByIdentifierUserId.sql
index 00e38687e7..430ba2986e 100644
--- a/src/Sql/dbo/Stored Procedures/Device_ReadByIdentifierUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_ReadByIdentifierUserId.sql	
@@ -12,4 +12,4 @@ BEGIN
     WHERE
         [UserId] = @UserId
         AND [Identifier] = @Identifier
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Device_ReadByUserId.sql
index 670969cd0b..b885b633a7 100644
--- a/src/Sql/dbo/Stored Procedures/Device_ReadByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_ReadByUserId.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[DeviceView]
     WHERE
         [UserId] = @UserId
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Device_Update.sql b/src/Sql/dbo/Stored Procedures/Device_Update.sql
index a024fc3ec6..a2cc87e5e1 100644
--- a/src/Sql/dbo/Stored Procedures/Device_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_Update.sql	
@@ -23,4 +23,4 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/History_ReadById.sql b/src/Sql/dbo/Stored Procedures/History_ReadById.sql
index 53343f12b3..900c3e1083 100644
--- a/src/Sql/dbo/Stored Procedures/History_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/History_ReadById.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[HistoryView]
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_Create.sql b/src/Sql/dbo/Stored Procedures/User_Create.sql
index 8cedfc0cb4..2ebc7eee13 100644
--- a/src/Sql/dbo/Stored Procedures/User_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_Create.sql	
@@ -57,4 +57,4 @@ BEGIN
         @CreationDate,
         @RevisionDate
     )
-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 f6bb3207d5..494782f8b6 100644
--- a/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
@@ -40,4 +40,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_ReadByEmail.sql b/src/Sql/dbo/Stored Procedures/User_ReadByEmail.sql
index 59be670171..0343576b31 100644
--- a/src/Sql/dbo/Stored Procedures/User_ReadByEmail.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_ReadByEmail.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[UserView]
     WHERE
         [Email] = @Email
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_ReadById.sql b/src/Sql/dbo/Stored Procedures/User_ReadById.sql
index da50844752..f8e2ffff52 100644
--- a/src/Sql/dbo/Stored Procedures/User_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_ReadById.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[UserView]
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_Update.sql b/src/Sql/dbo/Stored Procedures/User_Update.sql
index 8f895b3087..50083d6e00 100644
--- a/src/Sql/dbo/Stored Procedures/User_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_Update.sql	
@@ -39,4 +39,4 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql b/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql
index 42fb059e76..06699c262d 100644
--- a/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_UpdateEmailPassword.sql	
@@ -19,4 +19,4 @@ BEGIN
         [RevisionDate] = @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 0dead7a54e..83f30b5a46 100644
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@@ -43,7 +43,6 @@ BEGIN
     FROM
         INSERTED
 END
-
 GO
 CREATE TRIGGER [dbo].[Cipher_Updated]
 ON [dbo].[Cipher] AFTER UPDATE
@@ -69,7 +68,6 @@ BEGIN
     FROM
         INSERTED
 END
-
 GO
 CREATE TRIGGER [dbo].[Cipher_Deleted]
 ON [dbo].[Cipher] AFTER DELETE
@@ -94,4 +92,4 @@ BEGIN
         GETUTCDATE()
     FROM
         DELETED
-END
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Tables/User.sql b/src/Sql/dbo/Tables/User.sql
index 6719b71d69..2b33f0cb82 100644
--- a/src/Sql/dbo/Tables/User.sql
+++ b/src/Sql/dbo/Tables/User.sql
@@ -1,20 +1,20 @@
 CREATE TABLE [dbo].[User] (
-    [Id]                                UNIQUEIDENTIFIER NOT NULL,
-    [Name]                              NVARCHAR (50)    NULL,
-    [Email]                             NVARCHAR (50)    NOT NULL,
-    [EmailVerified]                     BIT              NOT NULL,
-    [MasterPassword]                    NVARCHAR (300)   NOT NULL,
-    [MasterPasswordHint]                NVARCHAR (50)    NULL,
-    [Culture]                           NVARCHAR (10)    NOT NULL,
-    [SecurityStamp]                     NVARCHAR (50)    NOT NULL,
-    [TwoFactorEnabled]                  BIT              NOT NULL,
-    [TwoFactorProvider]                 TINYINT          NULL,
-    [AuthenticatorKey]                  NVARCHAR (50)    NULL,
-    [TwoFactorRecoveryCode]             NVARCHAR (32)    NULL,
-    [EquivalentDomains]                 NVARCHAR (MAX)   NULL,
-    [ExcludedGlobalEquivalentDomains]   NVARCHAR (MAX)   NULL,
-    [CreationDate]                      DATETIME2 (7)    NOT NULL,
-    [RevisionDate]                      DATETIME2 (7)    NOT NULL,
+    [Id]                              UNIQUEIDENTIFIER NOT NULL,
+    [Name]                            NVARCHAR (50)    NULL,
+    [Email]                           NVARCHAR (50)    NOT NULL,
+    [EmailVerified]                   BIT              NOT NULL,
+    [MasterPassword]                  NVARCHAR (300)   NOT NULL,
+    [MasterPasswordHint]              NVARCHAR (50)    NULL,
+    [Culture]                         NVARCHAR (10)    NOT NULL,
+    [SecurityStamp]                   NVARCHAR (50)    NOT NULL,
+    [TwoFactorEnabled]                BIT              NOT NULL,
+    [TwoFactorProvider]               TINYINT          NULL,
+    [AuthenticatorKey]                NVARCHAR (50)    NULL,
+    [TwoFactorRecoveryCode]           NVARCHAR (32)    NULL,
+    [EquivalentDomains]               NVARCHAR (MAX)   NULL,
+    [ExcludedGlobalEquivalentDomains] NVARCHAR (MAX)   NULL,
+    [CreationDate]                    DATETIME2 (7)    NOT NULL,
+    [RevisionDate]                    DATETIME2 (7)    NOT NULL,
     CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 
diff --git a/src/Sql/dbo/Views/CipherView.sql b/src/Sql/dbo/Views/CipherView.sql
index 58a144318e..5ca8288562 100644
--- a/src/Sql/dbo/Views/CipherView.sql
+++ b/src/Sql/dbo/Views/CipherView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[Cipher]
+    [dbo].[Cipher]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/DeviceView.sql b/src/Sql/dbo/Views/DeviceView.sql
index ab10905444..a6b1d5aecc 100644
--- a/src/Sql/dbo/Views/DeviceView.sql
+++ b/src/Sql/dbo/Views/DeviceView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[Device]
+    [dbo].[Device]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/HistoryView.sql b/src/Sql/dbo/Views/HistoryView.sql
index 0b0caceda6..0fc043c0b1 100644
--- a/src/Sql/dbo/Views/HistoryView.sql
+++ b/src/Sql/dbo/Views/HistoryView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[History]
+    [dbo].[History]
\ No newline at end of file