diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
index 7555cf13..deff19e5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
@@ -10,7 +10,7 @@
 <div class="FormBody">
     
     <p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;">
-        <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain" OnTextChanged="DomainName_TextChanged"></wsp:DomainControl>
+        <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain"></wsp:DomainControl>
     </p>
     
     <wsp:CollapsiblePanel id="OptionsPanelHeader" runat="server"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
index 4ddaa98e..e0fe621f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
@@ -158,7 +158,10 @@ namespace WebsitePanel.Portal
 			// allow sub-domains
 			AllowSubDomainsPanel.Visible = (type == DomainType.Domain) && PanelSecurity.EffectiveUser.Role != UserRole.User;
 
-		    CheckForCorrectIdnDomainUsage(DomainName.Text);
+		    if (IsPostBack)
+		    {
+		        CheckForCorrectIdnDomainUsage(DomainName.Text);
+		    }
 		}
 
 		private DomainType GetDomainType(string typeName)
@@ -279,10 +282,5 @@ namespace WebsitePanel.Portal
 
 	        return true;
 	    }
-
-	    protected void DomainName_TextChanged(object sender, DomainControl.DomainNameEventArgs e)
-	    {
-            CheckForCorrectIdnDomainUsage(e.DomainName);
-	    }
 	}
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs
index ce31b664..9786c25d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs
@@ -77,11 +77,15 @@ namespace WebsitePanel.Portal.UserControls
             get
             {
                 var domainName = txtDomainName.Text.Trim();
-                if (IsSubDomain)
+                if (!IsSubDomain) return domainName;
+
+                if (string.IsNullOrEmpty(domainName))
                 {
-                    domainName += "." + DomainsList.SelectedValue;
+                    // Only return selected domain from DomainsList when no subdomain is entered yet
+                    return DomainsList.SelectedValue;
                 }
-                return domainName;
+
+                return domainName + "." + DomainsList.SelectedValue;
             }
             set { txtDomainName.Text = value; }
         }