diff --git a/NzbDrone.Api/Settings/SettingsModule.cs b/NzbDrone.Api/Settings/SettingsModule.cs
index f91cb14a5..a9bd74782 100644
--- a/NzbDrone.Api/Settings/SettingsModule.cs
+++ b/NzbDrone.Api/Settings/SettingsModule.cs
@@ -32,6 +32,8 @@ namespace NzbDrone.Api.Settings
         private Response SaveSettings()
         {
             var request = Request.Body.FromJson<Dictionary<string, object>>();
+            _configService.SaveValues(request);
+
 
             return request.AsResponse();
         }
diff --git a/NzbDrone.Core/Configuration/ConfigService.cs b/NzbDrone.Core/Configuration/ConfigService.cs
index ed6d138ed..ecf02ca9a 100644
--- a/NzbDrone.Core/Configuration/ConfigService.cs
+++ b/NzbDrone.Core/Configuration/ConfigService.cs
@@ -593,6 +593,23 @@ namespace NzbDrone.Core.Configuration
             ClearCache();
         }
 
+        public void SaveValues(Dictionary<string, object> configValues)
+        {
+            //Todo: make this not suck - we need the pascal case of the key
+            //Todo: Can we batch save this without savig default values? Or do we care?
+
+            var allWithDefaults = AllWithDefaults();
+
+            foreach(var configValue in configValues)
+            {
+                object currentValue;
+                allWithDefaults.TryGetValue(configValue.Key, out currentValue);
+
+                if (!configValue.Equals(currentValue))
+                    SetValue(configValue.Key, configValue.Value.ToString());
+            }
+        }
+
         private void EnsureCache()
         {
             lock (_cache)
diff --git a/NzbDrone.Core/Configuration/IConfigService.cs b/NzbDrone.Core/Configuration/IConfigService.cs
index 43588fb49..f8b3b8fc8 100644
--- a/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/NzbDrone.Core/Configuration/IConfigService.cs
@@ -87,5 +87,6 @@ namespace NzbDrone.Core.Configuration
         PriorityType NzbgetRecentTvPriority { get; set; }
         string GetValue(string key, object defaultValue, bool persist = false);
         void SetValue(string key, string value);
+        void SaveValues(Dictionary<string, object> configValues);
     }
 }
\ No newline at end of file