diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3766094f..a3bcbce3 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=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
   </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="3x7eqt7zabc5n5afs6dg" />
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
     <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs
index c5ebfe6b..8e8be38f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs
@@ -38,6 +38,7 @@ using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 
 using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.Web;
 
 namespace WebsitePanel.Portal
 {
@@ -108,6 +109,10 @@ namespace WebsitePanel.Portal
         {
             DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PackageId);
 
+            WebSite[] sites = null;
+            if (HideWebSites)
+                sites = ES.Services.WebServers.GetWebSites(PackageId, false);
+
             ddlDomains.Items.Clear();
 
             // add "select" item
@@ -115,10 +120,28 @@ namespace WebsitePanel.Portal
 
             foreach (DomainInfo domain in domains)
             {
-                if (HideWebSites && domain.WebSiteId > 0)
-                    continue;
+                if (HideWebSites)
+                {
+                    if (domain.WebSiteId > 0)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        bool bFound = false;
+                        foreach (WebSite w in sites)
+                        {
+                            if (w.Name.ToLower() == domain.DomainName.ToLower())
+                            {
+                                bFound = true;
+                                break;
+                            }
+                        }
+                        if (bFound) continue;
+                    }
+                }
                 else if (HideInstantAlias && domain.IsInstantAlias)
-                    continue; 
+                    continue;
                 else if (HideMailDomains && domain.MailDomainId > 0)
                     continue;
                 else if (HideDomainPointers && (domain.IsDomainPointer))
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddSite.ascx.cs
index 17c4c3e3..27f2224c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddSite.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesAddSite.ascx.cs
@@ -62,10 +62,10 @@ namespace WebsitePanel.Portal
 
         private void ToggleControls()
         {
-            rowDedicatedIP.Visible = rbDedicatedIP.Checked;
-
             PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
+            rowDedicatedIP.Visible = rbDedicatedIP.Checked;
+            
             if (Utils.CheckQouta(Quotas.WEB_ENABLEHOSTNAMESUPPORT, cntx))
             {
                 txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = true;
@@ -78,6 +78,7 @@ namespace WebsitePanel.Portal
                 txtHostName.Visible = chkIgnoreGlobalDNSRecords.Visible = lblIgnoreGlobalDNSRecords.Visible = lblTheDotInTheMiddle.Visible = false;
                 chkIgnoreGlobalDNSRecords.Checked = true;
                 txtHostName.Text = "";
+                domainsSelectDomainControl.HideWebSites = true;
             }
 
         }