diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index c8d36c92..f3dc6d89 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -5620,5 +5620,10 @@
   <data name="SchedulerTask.SCHEDULE_TASK_DOMAIN_EXPIRATION" xml:space="preserve">
     <value>Check domain expiration date</value>
   </data>
-
+  <data name="ERROR.IDNDOMAIN_NO_MAIL" xml:space="preserve">
+    <value>You cannot use a IDN domain name for mail</value>
+  </data>
+  <data name="ERROR.IDNDOMAIN_NO_ORGANIZATION" xml:space="preserve">
+    <value>You cannot use a IDN domain name for organizations</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
index e1f91b1b..7555cf13 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
@@ -10,12 +10,8 @@
 <div class="FormBody">
     
     <p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;">
-        <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain" AutoPostBack="True" OnTextChanged="DomainName_TextChanged"></wsp:DomainControl>
+        <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain" OnTextChanged="DomainName_TextChanged"></wsp:DomainControl>
     </p>
-<%--    
-    <p id="SubDomainPanel" runat="server" style="padding: 15px 0 15px 5px;" visible="false">
-        <wsp:DomainControl ID="SubDomainName" runat="server" RequiredEnabled="True" IsSubDomain="True" ValidationGroup="Domain"></wsp:DomainControl>
-    </p>--%>
     
     <wsp:CollapsiblePanel id="OptionsPanelHeader" runat="server"
         TargetControlID="OptionsPanel" resourcekey="OptionsPanelHeader" Text="Provisioning options">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
index 017e6797..6158be2b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
@@ -260,15 +260,27 @@ namespace WebsitePanel.Portal
 		}
 		protected void btnAdd_Click(object sender, EventArgs e)
 		{
-			AddDomain();
+		    if (CheckForCorrectIdnDomainUsage(DomainName.Text))
+		    {
+		        AddDomain();
+		    }
 		}
 
+	    private bool CheckForCorrectIdnDomainUsage(string domainName)
+	    {
+	        // If the choosen domain is a idn domain, don't allow to create mail
+	        if (Utils.IsIdnDomain(domainName) && PointMailDomain.Checked)
+	        {
+	            ShowErrorMessage("IDNDOMAIN_NO_MAIL");
+	            return false;
+	        }
+
+	        return true;
+	    }
+
 	    protected void DomainName_TextChanged(object sender, DomainControl.DomainNameEventArgs e)
 	    {
-	        // If the choosen domain is a idn domain, don't allow to create mail
-	        var isIdn = Utils.IsIdnDomain(e.DomainName);
-	        PointMailDomainPanel.Enabled = !isIdn;
-	        PointMailDomain.Checked = !isIdn;
+            CheckForCorrectIdnDomainUsage(e.DomainName);
 	    }
 	}
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx
index ff40e5e3..1d5fe8a2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx
@@ -73,7 +73,7 @@
                     <asp:Localize ID="locDomainName" runat="server" meta:resourcekey="locDomainName" Text="Domain name:"></asp:Localize>
                 </td>
                 <td class="Normal" width="100%">
-                    <wsp:DomainControl ID="txtDomainName" runat="server" RequiredEnabled="True" ValidationGroup="CreateSpace" AutoPostBack="True" OnTextChanged="txtDomainName_OnTextChanged"></wsp:DomainControl>
+                    <wsp:DomainControl ID="txtDomainName" runat="server" RequiredEnabled="True" ValidationGroup="CreateSpace" OnTextChanged="txtDomainName_OnTextChanged"></wsp:DomainControl>
                 </td>
             </tr>
         </table>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
index b0cfd4af..18d830b0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
@@ -250,7 +250,10 @@ namespace WebsitePanel.Portal
 
         protected void btnCreate_Click(object sender, EventArgs e)
         {
-            CreateHostingSpace();
+            if (CheckForCorrectIdnDomainUsage())
+            {
+                CreateHostingSpace();
+            }
         }
 
         protected void rbFtpAccountName_SelectedIndexChanged(object sender, EventArgs e)
@@ -268,19 +271,29 @@ namespace WebsitePanel.Portal
             BindHostingPlan();
         }
 
-        protected void txtDomainName_OnTextChanged(object sender, DomainControl.DomainNameEventArgs e)
+        private bool CheckForCorrectIdnDomainUsage()
         {
             if (Utils.IsIdnDomain(txtDomainName.Text))
             {
-                fsMail.Disabled = true;
-                chkIntegratedOUProvisioning.Checked = false;
-                chkIntegratedOUProvisioning.Enabled = false;
-            }
-            else
-            {
-                fsMail.Disabled = false;
-                BindHostingPlan();
+                if (chkIntegratedOUProvisioning.Checked)
+                {
+                    ShowErrorMessage("IDNDOMAIN_NO_ORGANIZATION");
+                    return false;
+                }
+
+                if (chkCreateMailAccount.Checked)
+                {
+                    ShowErrorMessage("IDNDOMAIN_NO_MAIL");
+                    return false;
+                }
             }
+
+            return true;
+        }
+
+        protected void txtDomainName_OnTextChanged(object sender, DomainControl.DomainNameEventArgs e)
+        {
+            CheckForCorrectIdnDomainUsage();
         }
     }
 }
\ No newline at end of file