diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index f5a5317d..f53f17b4 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -5898,7 +5898,7 @@ CREATE TABLE #TempDomains
 	[DomainItemID] [int] NULL,
 )
 
-UPDATE Domains SET DomainItemID = DomainID
+UPDATE Domains SET DomainItemID = DomainID WHERE DomainItemID IS NULL
 
 INSERT INTO #TempDomains SELECT PackageID,
 ZoneItemID,
@@ -5913,6 +5913,7 @@ DomainItemID FROM Domains WHERE IsDomainPointer = 1
 
 UPDATE Domains SET IsDomainPointer=0,WebSiteID=NULL, DomainItemID=NULL WHERE IsDomainPointer = 1 AND DomainName IN (SELECT DomainName FROM Domains AS D WHERE 
 D.DomainName = (SELECT DISTINCT ItemName FROM ServiceItems WHERE ItemID = D.ZoneItemId )
+AND DomainItemID IS NULL
 Group BY DOmainName
 HAVING (COUNT(DomainName) = 1)) 
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3766094f..7419631a 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,12 +5,19 @@
   </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" />  <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
     <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />