diff --git a/bitwarden_license/src/Portal/Controllers/SsoController.cs b/bitwarden_license/src/Portal/Controllers/SsoController.cs
index a0f3eb550a..363d9bbc68 100644
--- a/bitwarden_license/src/Portal/Controllers/SsoController.cs
+++ b/bitwarden_license/src/Portal/Controllers/SsoController.cs
@@ -12,17 +12,20 @@ namespace Bit.Portal.Controllers
     public class SsoController : Controller
     {
         private readonly ISsoConfigRepository _ssoConfigRepository;
+        private readonly ISsoConfigService _ssoConfigService;
         private readonly EnterprisePortalCurrentContext _enterprisePortalCurrentContext;
         private readonly II18nService _i18nService;
         private readonly GlobalSettings _globalSettings;
 
         public SsoController(
             ISsoConfigRepository ssoConfigRepository,
+            ISsoConfigService ssoConfigService,
             EnterprisePortalCurrentContext enterprisePortalCurrentContext,
             II18nService i18nService,
             GlobalSettings globalSettings)
         {
             _ssoConfigRepository = ssoConfigRepository;
+            _ssoConfigService = ssoConfigService;
             _enterprisePortalCurrentContext = enterprisePortalCurrentContext;
             _i18nService = i18nService;
             _globalSettings = globalSettings;
@@ -74,16 +77,14 @@ namespace Bit.Portal.Controllers
             var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(orgId.Value);
             if (ssoConfig == null)
             {
-                ssoConfig = model.ToSsoConfig();
-                ssoConfig.OrganizationId = orgId.GetValueOrDefault();
-                await _ssoConfigRepository.CreateAsync(ssoConfig);
+                ssoConfig = model.ToSsoConfig(orgId.GetValueOrDefault());
             }
             else
             {
                 ssoConfig = model.ToSsoConfig(ssoConfig);
-                await _ssoConfigRepository.ReplaceAsync(ssoConfig);
             }
 
+            await _ssoConfigService.SaveAsync(ssoConfig);
             return View(model);
         }
     }
diff --git a/bitwarden_license/src/Portal/Models/SsoConfigEditViewModel.cs b/bitwarden_license/src/Portal/Models/SsoConfigEditViewModel.cs
index 7ef1c61591..62819e0247 100644
--- a/bitwarden_license/src/Portal/Models/SsoConfigEditViewModel.cs
+++ b/bitwarden_license/src/Portal/Models/SsoConfigEditViewModel.cs
@@ -55,9 +55,9 @@ namespace Bit.Portal.Models
         public List<SelectListItem> SigningBehaviors { get; set; }
         public List<SelectListItem> SigningAlgorithms { get; set; }
 
-        public SsoConfig ToSsoConfig()
+        public SsoConfig ToSsoConfig(Guid organizationId)
         {
-            return ToSsoConfig(new SsoConfig());
+            return ToSsoConfig(new SsoConfig { OrganizationId = organizationId });
         }
 
         public SsoConfig ToSsoConfig(SsoConfig existingConfig)
diff --git a/src/Core/Repositories/SqlServer/SsoConfigRepository.cs b/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
index 0fe3cec258..50084297fc 100644
--- a/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
+++ b/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
@@ -57,17 +57,5 @@ namespace Bit.Core.Repositories.SqlServer
                 return results.ToList();
             }
         }
-
-        public override async Task CreateAsync(SsoConfig obj)
-        {
-            obj.CreationDate = obj.RevisionDate = DateTime.UtcNow;
-            await base.CreateAsync(obj);
-        }
-
-        public override async Task ReplaceAsync(SsoConfig obj)
-        {
-            obj.RevisionDate = DateTime.UtcNow;
-            await base.ReplaceAsync(obj);
-        }
     }
 }
diff --git a/src/Core/Services/ISsoConfigService.cs b/src/Core/Services/ISsoConfigService.cs
new file mode 100644
index 0000000000..9154dcccab
--- /dev/null
+++ b/src/Core/Services/ISsoConfigService.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Bit.Core.Models.Table;
+
+namespace Bit.Core.Services
+{
+    public interface ISsoConfigService
+    {
+        Task SaveAsync(SsoConfig config);
+    }
+}
diff --git a/src/Core/Services/Implementations/SsoConfigService.cs b/src/Core/Services/Implementations/SsoConfigService.cs
new file mode 100644
index 0000000000..714d9df4d3
--- /dev/null
+++ b/src/Core/Services/Implementations/SsoConfigService.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+
+namespace Bit.Core.Services
+{
+    public class SsoConfigService : ISsoConfigService
+    {
+        private readonly ISsoConfigRepository _ssoConfigRepository;
+
+        public SsoConfigService(
+            ISsoConfigRepository ssoConfigRepository)
+        {
+            _ssoConfigRepository = ssoConfigRepository;
+        }
+
+        public async Task SaveAsync(SsoConfig config)
+        {
+            var now = DateTime.UtcNow;
+            config.RevisionDate = now;
+            if (config.Id == default)
+            {
+                config.CreationDate = now;
+            }
+            await _ssoConfigRepository.UpsertAsync(config);
+        }
+    }
+}
diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs
index cdb55fca32..4686c3fcb0 100644
--- a/src/Core/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Core/Utilities/ServiceCollectionExtensions.cs
@@ -112,6 +112,7 @@ namespace Bit.Core.Utilities
             services.AddScoped<Services.IEventService, EventService>();
             services.AddSingleton<IDeviceService, DeviceService>();
             services.AddSingleton<IAppleIapService, AppleIapService>();
+            services.AddSingleton<ISsoConfigService, SsoConfigService>();
         }
 
         public static void AddDefaultServices(this IServiceCollection services, GlobalSettings globalSettings)