diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 697cd4e3..21051683 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -694,6 +694,7 @@ FROM Domains AS D
 INNER JOIN Packages AS P ON D.PackageID = P.PackageID
 WHERE CHARINDEX('.' + DomainName, @DomainName) > 0
 AND (CHARINDEX('.' + DomainName, @DomainName) + LEN('.' + DomainName)) = LEN(@DomainName) + 1
+AND IsDomainPointer = 0
 
 -- this is a domain of other user
 IF @UserID <> @DomainUserID AND @HostingAllowed = 0
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
index 01621fa2..36ca6285 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
@@ -5,6 +5,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\..\LICENSE.txt = ..\..\LICENSE.txt
 		..\..\Readme.htm = ..\..\Readme.htm
 		..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm
+		..\Database\update_db.sql = ..\Database\update_db.sql
 		VersionInfo.vb = VersionInfo.vb
 	EndProjectSection
 EndProject
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
index bc4864be..e01e1ccd 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
@@ -1800,11 +1800,9 @@ namespace WebsitePanel.EnterpriseServer
                 else if (isDomainPointer)
                 {
                     // domain pointer
-                    /*
                     if (PackageController.GetPackageQuota(packageId, Quotas.OS_DOMAINPOINTERS).QuotaExhausted)
                         return BusinessErrorCodes.ERROR_DOMAIN_QUOTA_LIMIT;
-                     */
-                }
+                 }
                 else
                 {
                     // top-level domain
@@ -2173,22 +2171,25 @@ namespace WebsitePanel.EnterpriseServer
                 }
 
                 // add web site pointer if required
+                /*
                 if (domain.WebSiteId > 0 && instantAlias.WebSiteId == 0)
                 {
                     int webRes = WebServerController.AddWebSitePointer(domain.WebSiteId, hostName, domainId);
                     if (webRes < 0)
                         return webRes;
                 }
-                /*
-                                // add mail domain pointer
-                                if (domain.MailDomainId > 0 && instantAlias.MailDomainId == 0)
-                                {
-                                    int mailRes = MailServerController.AddMailDomainPointer(domain.MailDomainId, instantAliasId);
-                                    if (mailRes < 0)
-                                        return mailRes;
-                                }
                  */
 
+                                // add mail domain pointer
+                /*
+                if (domain.MailDomainId > 0 && instantAlias.MailDomainId == 0)
+                {
+                    int mailRes = MailServerController.AddMailDomainPointer(domain.MailDomainId, instantAliasId);
+                    if (mailRes < 0)
+                        return mailRes;
+                }
+                */
+
                 return 0;
             }
             catch (Exception ex)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
index 26f3c3c9..433fe879 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
@@ -275,6 +275,7 @@ namespace WebsitePanel.EnterpriseServer
                 {
                     // DEDICATED IP
                     bindings.Add(new ServerBinding(ipAddr, "80", ""));
+                    bindings.Add(new ServerBinding(ipAddr, "443", ""));
                 }
 
                 UserInfo user = PackageController.GetPackageOwner(packageId);
@@ -679,6 +680,10 @@ namespace WebsitePanel.EnterpriseServer
                 ServerBinding srvBinding = new ServerBinding(ipAddr, "80", "");
                 newBindings.Add(srvBinding);
 
+                srvBinding = new ServerBinding(ipAddr, "443", "");
+                newBindings.Add(srvBinding);
+
+
                 foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId))
                 {
                     if (!((b.Host == srvBinding.Host) &