diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql
index 4da50037d..e898231d7 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_Create.sql	
@@ -3,6 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @UserId UNIQUEIDENTIFIER,
     @Email NVARCHAR(50),
+    @Key VARCHAR(MAX),
     @Status TINYINT,
     @Type TINYINT,
     @CreationDate DATETIME2(7),
@@ -17,6 +18,7 @@ BEGIN
         [OrganizationId],
         [UserId],
         [Email],
+        [Key],
         [Status],
         [Type],
         [CreationDate],
@@ -28,6 +30,7 @@ BEGIN
         @OrganizationId,
         @UserId,
         @Email,
+        @Key,
         @Status,
         @Type,
         @CreationDate,
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql
index 402f1b66b..88249959d 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql	
@@ -3,6 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @UserId UNIQUEIDENTIFIER,
     @Email NVARCHAR(50),
+    @Key VARCHAR(MAX),
     @Status TINYINT,
     @Type TINYINT,
     @CreationDate DATETIME2(7),
@@ -17,6 +18,7 @@ BEGIN
         [OrganizationId] = @OrganizationId,
         [UserId] = @UserId,
         [Email] = @Email,
+        [Key] = @Key,
         [Status] = @Status,
         [Type] = @Type,
         [CreationDate] = @CreationDate,
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql b/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql
index e9b524868..13cbfcdd5 100644
--- a/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql	
@@ -2,7 +2,6 @@
     @Id UNIQUEIDENTIFIER,
     @SubvaultId UNIQUEIDENTIFIER,
     @UserId UNIQUEIDENTIFIER,
-    @Key VARCHAR(MAX),
     @Admin BIT,
     @ReadOnly BIT,
     @CreationDate DATETIME2(7),
@@ -16,7 +15,6 @@ BEGIN
         [Id],
         [SubvaultId],
         [UserId],
-        [Key],
         [Admin],
         [ReadOnly],
         [CreationDate],
@@ -27,7 +25,6 @@ BEGIN
         @Id,
         @SubvaultId,
         @UserId,
-        @Key,
         @Admin,
         @ReadOnly,
         @CreationDate,
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql b/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql
index 7450b0be8..bb3639c59 100644
--- a/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql	
@@ -16,7 +16,6 @@ BEGIN
     SET
         [SubvaultId] = @SubvaultId,
         [UserId] = @UserId,
-        [Key] = @Key,
         [Admin] = @Admin,
         [ReadOnly] = @ReadOnly,
         [CreationDate] = @CreationDate,
diff --git a/src/Sql/dbo/Tables/OrganizationUser.sql b/src/Sql/dbo/Tables/OrganizationUser.sql
index 6c5c30d16..aebdf9306 100644
--- a/src/Sql/dbo/Tables/OrganizationUser.sql
+++ b/src/Sql/dbo/Tables/OrganizationUser.sql
@@ -3,6 +3,7 @@
     [OrganizationId] UNIQUEIDENTIFIER NOT NULL,
     [UserId]         UNIQUEIDENTIFIER NULL,
     [Email]          NVARCHAR (50)    NULL,
+    [Key]            VARCHAR (MAX)    NULL,
     [Status]         TINYINT          NOT NULL,
     [Type]           TINYINT          NOT NULL,
     [CreationDate]   DATETIME2 (7)    NOT NULL,
diff --git a/src/Sql/dbo/Tables/SubvaultUser.sql b/src/Sql/dbo/Tables/SubvaultUser.sql
index 4bd0b849c..451bdc223 100644
--- a/src/Sql/dbo/Tables/SubvaultUser.sql
+++ b/src/Sql/dbo/Tables/SubvaultUser.sql
@@ -2,11 +2,10 @@
     [Id]           UNIQUEIDENTIFIER NOT NULL,
     [SubvaultId]   UNIQUEIDENTIFIER NOT NULL,
     [UserId]       UNIQUEIDENTIFIER NOT NULL,
-    [Key]          VARCHAR (MAX)    NOT NULL,
-    [CreationDate] DATETIME2 (7)    NOT NULL,
-    [RevisionDate] DATETIME2 (7)    NOT NULL,
     [Admin]        BIT              NOT NULL,
     [ReadOnly]     BIT              NOT NULL,
+    [CreationDate] DATETIME2 (7)    NOT NULL,
+    [RevisionDate] DATETIME2 (7)    NOT NULL,
     CONSTRAINT [PK_SubvaultUser] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_SubvaultUser_Subvault] FOREIGN KEY ([SubvaultId]) REFERENCES [dbo].[Subvault] ([Id]),
     CONSTRAINT [FK_SubvaultUser_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])