diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 14bd6b61f6..28265c72f9 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -65,11 +65,7 @@ namespace MediaBrowser.Api
         public void Post(ReportStartupWizardComplete request)
         {
             _config.Configuration.IsStartupWizardCompleted = true;
-            _config.Configuration.EnableLocalizedGuids = true;
-            _config.Configuration.EnableCustomPathSubFolders = true;
-            _config.Configuration.EnableDateLastRefresh = true;
-            _config.Configuration.EnableStandaloneMusicKeys = true;
-            _config.Configuration.EnableCaseSensitiveItemIds = true;
+            SetWizardFinishValues(_config.Configuration);
             _config.SaveConfiguration();
         }
 
@@ -111,6 +107,15 @@ namespace MediaBrowser.Api
             return result;
         }
 
+        private void SetWizardFinishValues(ServerConfiguration config)
+        {
+            config.EnableLocalizedGuids = true;
+            config.EnableCustomPathSubFolders = true;
+            config.EnableDateLastRefresh = true;
+            config.EnableStandaloneMusicKeys = true;
+            config.EnableCaseSensitiveItemIds = true;
+        }
+
         public void Post(UpdateStartupConfiguration request)
         {
             _config.Configuration.UICulture = request.UICulture;
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index b115440d60..1cb19afdf2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -215,6 +215,9 @@ namespace MediaBrowser.Model.Configuration
         {
             Migrations = new string[] { };
 
+            EnableLocalizedGuids = true;
+            EnableCustomPathSubFolders = true;
+
             ImageSavingConvention = ImageSavingConvention.Compatible;
             PublicPort = 8096;
             PublicHttpsPort = 8920;