diff --git a/src/Sql/dbo/Stored Procedures/Group_Create.sql b/src/Sql/dbo/Stored Procedures/Group_Create.sql
index 47777c72b6..f47df20897 100644
--- a/src/Sql/dbo/Stored Procedures/Group_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_Create.sql	
@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Group_Create]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
+    @Name NVARCHAR(100),
     @AccessAll BIT,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
diff --git a/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql b/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql
index 8719632cc4..84a56fa49e 100644
--- a/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_CreateWithCollections.sql	
@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Group_CreateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
+    @Name NVARCHAR(100),
     @AccessAll BIT,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
diff --git a/src/Sql/dbo/Stored Procedures/Group_Update.sql b/src/Sql/dbo/Stored Procedures/Group_Update.sql
index a2ab54db34..249e3e41ad 100644
--- a/src/Sql/dbo/Stored Procedures/Group_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_Update.sql	
@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Group_Update]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
+    @Name NVARCHAR(100),
     @AccessAll BIT,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
diff --git a/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql b/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql
index 27200ec36b..460c12b443 100644
--- a/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql	
+++ b/src/Sql/dbo/Stored Procedures/Group_UpdateWithCollections.sql	
@@ -1,7 +1,7 @@
 CREATE PROCEDURE [dbo].[Group_UpdateWithCollections]
     @Id UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
+    @Name NVARCHAR(100),
     @AccessAll BIT,
     @ExternalId NVARCHAR(300),
     @CreationDate DATETIME2(7),
diff --git a/util/Migrator/DbScripts/2019-05-15_00_GroupNameFixes.sql b/util/Migrator/DbScripts/2019-05-15_00_GroupNameFixes.sql
new file mode 100644
index 0000000000..12e642d5a7
--- /dev/null
+++ b/util/Migrator/DbScripts/2019-05-15_00_GroupNameFixes.sql
@@ -0,0 +1,175 @@
+IF OBJECT_ID('[dbo].[Group_Create]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_Create]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Group_Create]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    INSERT INTO [dbo].[Group]
+    (
+        [Id],
+        [OrganizationId],
+        [Name],
+        [AccessAll],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate]
+    )
+    VALUES
+    (
+        @Id,
+        @OrganizationId,
+        @Name,
+        @AccessAll,
+        @ExternalId,
+        @CreationDate,
+        @RevisionDate
+    )
+END
+GO
+
+IF OBJECT_ID('[dbo].[Group_CreateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_CreateWithCollections]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Group_CreateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Group_Create] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[Collection]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionGroup]
+    (
+        [CollectionId],
+        [GroupId],
+        [ReadOnly]
+    )
+    SELECT
+        [Id],
+        @Id,
+        [ReadOnly]
+    FROM
+        @Collections
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+END
+GO
+
+IF OBJECT_ID('[dbo].[Group_Update]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_Update]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Group_Update]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        [dbo].[Group]
+    SET
+        [OrganizationId] = @OrganizationId,
+        [Name] = @Name,
+        [AccessAll] = @AccessAll,
+        [ExternalId] = @ExternalId,
+        [CreationDate] = @CreationDate,
+        [RevisionDate] = @RevisionDate
+    WHERE
+        [Id] = @Id
+END
+GO
+
+IF OBJECT_ID('[dbo].[Group_UpdateWithCollections]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Group_UpdateWithCollections]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Group_UpdateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Name NVARCHAR(100),
+    @AccessAll BIT,
+    @ExternalId NVARCHAR(300),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Group_Update] @Id, @OrganizationId, @Name, @AccessAll, @ExternalId, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[Collection]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionGroup] AS [Target]
+    USING 
+        @Collections AS [Source]
+    ON
+        [Target].[CollectionId] = [Source].[Id]
+        AND [Target].[GroupId] = @Id
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
+        INSERT VALUES
+        (
+            [Source].[Id],
+            @Id,
+            [Source].[ReadOnly]
+        )
+    WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[GroupId] = @Id THEN
+        DELETE
+    ;
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+END
+GO