diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
index ea90728d..530a56d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
@@ -5336,11 +5336,23 @@ namespace WebsitePanel.EnterpriseServer
 
                 // get mailbox settings
                 int exchangeServiceId = GetExchangeServiceID(org.PackageId);
+
+                if (exchangeServiceId <= 0)
+                    return null;
+
                 ExchangeServer exchange = GetExchangeServer(exchangeServiceId, org.ServiceId);
 
                 if (exchange == null)
                     return null;
 
+                //Create Exchange Organization
+                if (string.IsNullOrEmpty(org.GlobalAddressList))
+                {
+                    ExtendToExchangeOrganization(ref org);
+
+                    PackageController.UpdatePackageItem(org);
+                }
+
                 res = exchange.CreateOrganizationRootPublicFolder(org.OrganizationId, org.DistinguishedName, org.SecurityGroup, org.DefaultDomain);
             }
             catch (Exception ex)