diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
index 164ad64f..11336783 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
@@ -460,13 +460,17 @@ namespace WebsitePanel.EnterpriseServer
                             domain.PackageId = packageId;
                             domain.DomainName = domainName;
                             domain.HostingAllowed = false;
-                            domainId = ServerController.AddDomain(domain, createInstantAlias, true);
+                            domainId = ServerController.AddDomain(domain, false, true);
                             if (domainId < 0)
                             {
                                 result.Result = domainId;
                                 DeletePackage(packageId);
                                 return result;
                             }
+
+                            if (createInstantAlias)
+                                ServerController.CreateDomainInstantAlias("", domainId);
+
                         }
                         catch (Exception ex)
                         {
@@ -481,7 +485,7 @@ namespace WebsitePanel.EnterpriseServer
                         // create web site
                         try
                         {
-                            int webSiteId = WebServerController.AddWebSite(packageId, hostName, domainId, 0, true, false);
+                            int webSiteId = WebServerController.AddWebSite(packageId, hostName, domainId, 0, createInstantAlias, false);
                             if (webSiteId < 0)
                             {
                                 result.Result = webSiteId;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3766094f..7d97bfb9 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,12 +5,18 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
+    <!--
+    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
+    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
+    -->
+    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-    <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="1234567890" />
-    <!-- A1D4KDHUE83NKHddF -->
+    <!--
+    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
+    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
+    -->
+    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
     <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
index 12e24ee2..5bc7b0c6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
@@ -133,7 +133,7 @@ namespace WebsitePanel.Portal
                     spaceName,
                     Utils.ParseInt(ddlStatus.SelectedValue, 0),
                     chkPackageLetter.Checked,
-                    chkCreateResources.Checked, domainName, true, chkCreateWebSite.Checked,
+                    chkCreateResources.Checked, domainName, false, chkCreateWebSite.Checked,
                     chkCreateFtpAccount.Checked, ftpAccount, chkCreateMailAccount.Checked, "");
 
                 if (result.Result < 0)