diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 2b8341ab..b2830b5e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -1657,6 +1657,11 @@ namespace WebsitePanel.EnterpriseServer
 
             int maxLen = 19 - orgId.Length;
 
+            if (!string.IsNullOrEmpty(orgId))
+            {
+                orgId = orgId.TrimEnd(' ', '.');
+            }
+
             // try to choose name
             int i = 0;