diff --git a/src/Sql/dbo/Stored Procedures/Group_Create.sql b/src/Sql/dbo/Stored Procedures/Group_Create.sql
index 21ccd13869..47777c72b6 100644
--- a/src/Sql/dbo/Stored Procedures/Group_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_Create.sql	
@@ -3,7 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
     @AccessAll BIT,
-    @ExternalId NVARCHAR(50),
+    @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
 AS
diff --git a/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql b/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql
index 6fa8d1ed34..b8e13b11ea 100644
--- a/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql	
@@ -3,7 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
     @AccessAll BIT,
-    @ExternalId NVARCHAR(50),
+    @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
     @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
diff --git a/src/Sql/dbo/Stored Procedures/Group_Update.sql b/src/Sql/dbo/Stored Procedures/Group_Update.sql
index b54d09c520..a2ab54db34 100644
--- a/src/Sql/dbo/Stored Procedures/Group_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_Update.sql	
@@ -3,7 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
     @AccessAll BIT,
-    @ExternalId NVARCHAR(50),
+    @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
 AS
diff --git a/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql b/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql
index 068c7a1223..f5132ddd47 100644
--- a/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql	
@@ -3,7 +3,7 @@
     @OrganizationId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
     @AccessAll BIT,
-    @ExternalId NVARCHAR(50),
+    @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7),
     @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql
index c5d634f922..4b342b5a9c 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql	
@@ -10,6 +10,12 @@ BEGIN
     WHERE
         [OrganizationUserId] = @Id
 
+    DELETE
+    FROM
+        [dbo].[GroupUser]
+    WHERE
+        [OrganizationUserId] = @Id
+
     DELETE
     FROM
         [dbo].[OrganizationUser]
diff --git a/src/Sql/dbo/Tables/Group.sql b/src/Sql/dbo/Tables/Group.sql
index 8912fbde38..b58b8a3fc1 100644
--- a/src/Sql/dbo/Tables/Group.sql
+++ b/src/Sql/dbo/Tables/Group.sql
@@ -3,7 +3,7 @@
     [OrganizationId] UNIQUEIDENTIFIER NOT NULL,
     [Name]           NVARCHAR (50)    NOT NULL,
     [AccessAll]      BIT              NOT NULL,
-    [ExternalId]     NVARCHAR (50)    NULL,
+    [ExternalId]     NVARCHAR (300)   NULL,
     [CreationDate]   DATETIME         NOT NULL,
     [RevisionDate]   DATETIME         NOT NULL,
     CONSTRAINT [PK_Group] PRIMARY KEY CLUSTERED ([Id] ASC),