diff --git a/src/Core/Models/Api/Request/SsoConfigRequestModel.cs b/src/Core/Models/Api/Request/SsoConfigRequestModel.cs
index 565d846ff5..276f1dbaac 100644
--- a/src/Core/Models/Api/Request/SsoConfigRequestModel.cs
+++ b/src/Core/Models/Api/Request/SsoConfigRequestModel.cs
@@ -4,7 +4,7 @@ namespace Bit.Core.Models.Api
 {
     public class SsoConfigRequestModel
     {
-        public long Id { get; set; }
+        public long? Id { get; set; }
         public bool Enabled { get; set; }
         public Guid OrganizationId { get; set; }
         public string Data { get; set; }
diff --git a/src/Core/Models/Api/Response/SsoConfigResponseModel.cs b/src/Core/Models/Api/Response/SsoConfigResponseModel.cs
index e746239ed1..7c8069b311 100644
--- a/src/Core/Models/Api/Response/SsoConfigResponseModel.cs
+++ b/src/Core/Models/Api/Response/SsoConfigResponseModel.cs
@@ -19,7 +19,7 @@ namespace Bit.Core.Models.Api
             Data = ssoConfig.Data;
         }
 
-        public long Id { get; set; }
+        public long? Id { get; set; }
         public bool Enabled { get; set; }
         public Guid OrganizationId { get; set; }
         public string Data { get; set; }
diff --git a/src/Core/Models/Table/SsoConfig.cs b/src/Core/Models/Table/SsoConfig.cs
index a3f965e857..14d05a9922 100644
--- a/src/Core/Models/Table/SsoConfig.cs
+++ b/src/Core/Models/Table/SsoConfig.cs
@@ -4,7 +4,7 @@ namespace Bit.Core.Models.Table
 {
     public class SsoConfig
     {
-        public long Id { get; set; }
+        public long? Id { get; set; }
         public bool Enabled { get; set; } = true;
         public Guid OrganizationId { get; set; }
         public string Data { get; set; }
diff --git a/src/Sql/dbo/Stored Procedures/SsoConfig_Create.sql b/src/Sql/dbo/Stored Procedures/SsoConfig_Create.sql
index 0e707fd47c..3095b3f977 100644
--- a/src/Sql/dbo/Stored Procedures/SsoConfig_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/SsoConfig_Create.sql	
@@ -1,5 +1,5 @@
 CREATE PROCEDURE [dbo].[SsoConfig_Create]
-    @Id BIGINT,
+    @Id BIGINT OUTPUT,
     @Enabled BIT,
     @OrganizationId UNIQUEIDENTIFIER,
     @Data NVARCHAR(MAX),
@@ -8,6 +8,7 @@
 AS
 BEGIN
     SET NOCOUNT ON
+    SET @Id = SCOPE_IDENTITY();
 
     INSERT INTO [dbo].[SsoConfig]
     (
diff --git a/util/Migrator/DbScripts/2020-06-24_00_SsoConfig.sql b/util/Migrator/DbScripts/2020-06-24_00_SsoConfig.sql
index af7736a93e..213818fd8e 100644
--- a/util/Migrator/DbScripts/2020-06-24_00_SsoConfig.sql
+++ b/util/Migrator/DbScripts/2020-06-24_00_SsoConfig.sql
@@ -34,7 +34,7 @@ END
 GO
 
 CREATE PROCEDURE [dbo].[SsoConfig_Create]
-    @Id BIGINT,
+    @Id BIGINT OUTPUT,
     @Enabled BIT,
     @OrganizationId UNIQUEIDENTIFIER,
     @Data NVARCHAR(MAX),
@@ -43,6 +43,7 @@ CREATE PROCEDURE [dbo].[SsoConfig_Create]
 AS
 BEGIN
     SET NOCOUNT ON
+    SET @Id = SCOPE_IDENTITY();
 
     INSERT INTO [dbo].[SsoConfig]
     (