diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index ba8e3e88..3af7ac75 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,11 +5,11 @@
 	</configSections>
 	<!-- Connection strings -->
 	<connectionStrings>
-		<add name="EnterpriseServer" connectionString="${installer.connectionstring}" providerName="System.Data.SqlClient"/>
+		<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=WebsitePanel;pwd=Password12" providerName="System.Data.SqlClient"/>
 	</connectionStrings>
 	<appSettings>
 		<!-- Encryption util settings -->
-		<add key="WebsitePanel.CryptoKey" value="${installer.cryptokey}"/>
+		<add key="WebsitePanel.CryptoKey" value="1234567890"/>
 		<!-- A1D4KDHUE83NKHddF -->
 		<add key="WebsitePanel.EncryptionEnabled" value="true"/>
 		<!-- Web Applications -->
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Web.config b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
index 133e5739..0006cf32 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
@@ -42,7 +42,7 @@
 			<!-- Perform security check -->
 			<enabled value="true"/>
 			<!-- Server password -->
-			<password value="${installer.server.password}"/>
+			<password value="Z6JYIY9o9rX3FCWTz0sffYdiLdg="/>
 		</security>
 	</websitepanel.server>
 	<system.web>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
index f642d00d..a5e71f64 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
@@ -107,15 +107,23 @@ namespace WebsitePanel.Portal
 			}
 		}
 
-		private void BindListOfAvailableSslDomains(ServerBinding[] siteBindings, SSLCertificate[] siteCertificates)
+        private void BindListOfAvailableSslDomains(ServerBinding[] siteBindings, SSLCertificate[] siteCertificates, string websiteName = "")
 		{
-			lstDomains.Items.Clear();
-			//
-			foreach (ServerBinding binding in siteBindings)
-			{
-				//
-				lstDomains.Items.Add(new ListItem(binding.Host, binding.Host));
-			}
+            lstDomains.Items.Clear();
+            //
+            foreach (ServerBinding binding in siteBindings)
+            {
+                //
+                if (binding.IP.ToString().Length > 0 && binding.Host.Length == 0)
+                {
+                    lstDomains.Items.Add(new ListItem(websiteName, websiteName));
+                    lstDomains.Items.Add(new ListItem(String.Format("www.{0}", websiteName), String.Format("www.{0}", websiteName)));
+                }
+                else
+                {
+                    lstDomains.Items.Add(new ListItem(binding.Host, binding.Host));
+                }
+            }
 		}
 
 		public void BindWebItem(WebVirtualDirectory item)
@@ -137,7 +145,7 @@ namespace WebsitePanel.Portal
 
 				SSLNotInstalled.Visible = true;
 				//
-				BindListOfAvailableSslDomains(webSite.Bindings, certificates);
+                BindListOfAvailableSslDomains(webSite.Bindings, certificates, webSite.Name);
 
 				if (certificates.Length > 0)
 				{
@@ -560,7 +568,7 @@ namespace WebsitePanel.Portal
 
 				SSLNotInstalled.Visible = true;
 				//
-				BindListOfAvailableSslDomains(item.Bindings, certificates);
+				BindListOfAvailableSslDomains(item.Bindings, certificates, item.Name);
 
 				if (certificates.Length > 0)
 				{