diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
index 2f51f9b8..88a4fb78 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
@@ -109,6 +109,15 @@ namespace WebsitePanel.EnterpriseServer
 				delegate(ServiceProviderItem item) { return (Organization)item; }));
 		}
 
+        public static List<Organization> GetExchangeOrganizationsInternal(int packageId, bool recursive)
+        {
+            List<ServiceProviderItem> items = PackageController.GetPackageItemsByTypeInternal(packageId, null, typeof(Organization), recursive);
+
+            return items.ConvertAll<Organization>(
+                new Converter<ServiceProviderItem, Organization>(
+                delegate(ServiceProviderItem item) { return (Organization)item; }));
+        }
+
 		public static Organization GetOrganization(int itemId)
 		{
 			#region Demo Mode
@@ -2554,12 +2563,12 @@ namespace WebsitePanel.EnterpriseServer
                 
                     if ((Packages != null) & (Packages.Count > 0))
                     {
-                        orgs = GetExchangeOrganizations(Packages[0].PackageId, false);
+                        orgs = GetExchangeOrganizationsInternal(Packages[0].PackageId, false);
                     }
                 }
                 else
                 {
-                    orgs = GetExchangeOrganizations(1, false);
+                    orgs = GetExchangeOrganizationsInternal(1, false);
                 }
 
                 if ((orgs != null) &(orgs.Count > 0))
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
index a80b8388..24b440d5 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
@@ -1072,6 +1072,14 @@ namespace WebsitePanel.EnterpriseServer
             return CreateServiceItemsList(dsItems, 0);
         }
 
+        public static List<ServiceProviderItem> GetPackageItemsByTypeInternal(int packageId, string groupName, Type itemType, bool recursive)
+        {
+            string typeName = ObjectUtils.GetTypeFullName(itemType);
+            DataSet dsItems = DataProvider.GetServiceItems(-1, packageId, groupName, typeName, recursive);
+
+            return CreateServiceItemsList(dsItems, 0);
+        }
+
         public static DataSet GetRawPackageItemsByType(int packageId, Type itemType, bool recursive)
         {
             return GetRawPackageItemsByType(packageId, null, itemType, recursive);