diff --git a/src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardController.cs b/src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardController.cs
index a159a60f..bc51fca2 100644
--- a/src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardController.cs
+++ b/src/managed/OpenLiveWriter.PostEditor/Configuration/Wizard/WeblogConfigurationWizardController.cs
@@ -494,7 +494,7 @@ namespace OpenLiveWriter.PostEditor.Configuration.Wizard
             // Populate data
             var panel = (stepControl as WeblogConfigurationWizardPanelStaticSiteInitial);
             // Load static config from credentials provided
-            staticSiteConfig = StaticSiteConfig.LoadConfigFromCredentials( _temporarySettings.Credentials);
+            staticSiteConfig = StaticSiteConfig.LoadConfigFromBlogSettings( _temporarySettings);
             panel.LoadFromConfig(staticSiteConfig);
         }
 
@@ -577,6 +577,8 @@ namespace OpenLiveWriter.PostEditor.Configuration.Wizard
                 StaticSiteClient.CLIENT_TYPE
                 );
 
+            _temporarySettings.HomepageUrl = staticSiteConfig.SiteUrl;
+
             // Fill config into credentials
             staticSiteConfig.SaveToCredentials(_temporarySettings.Credentials);
         }