diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
index e9be078d..4f4fbdee 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
@@ -173,7 +173,7 @@ namespace WebsitePanel.EnterpriseServer
                         domain.PackageId = createdPackageId;
                         domain.DomainName = domainName;
                         domain.HostingAllowed = false;
-                        domainId = ServerController.AddDomain(domain, false, createZoneRecord);
+                        domainId = ServerController.AddDomain(domain, false, false);
                         if (domainId < 0)
                         {
                             // rollback wizard
@@ -323,6 +323,12 @@ namespace WebsitePanel.EnterpriseServer
                             return instantAliasId;
                         }
                     }
+
+                    // Domain DNS Zone
+                    if (createZoneRecord && (domainId > 0))
+                    {
+                        ServerController.EnableDomainDns(domainId);
+                    }
                 }
             }