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 d403de41..03121d6b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3395,6 +3395,12 @@
   <data name="Quota.HostedSharePointServer.MaxStorage" xml:space="preserve">
     <value>Max site storage, MB</value>
   </data>
+  <data name="Quota.HostedSharePointEnterprise.Sites" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collections per Organization</value>
+  </data>
+  <data name="Quota.HostedSharePointEnterprise.MaxStorage" xml:space="preserve">
+    <value>Max site storage, MB</value>
+  </data>
   <data name="Quota.HostedCRM.Users" xml:space="preserve">
     <value>Full licenses per organization</value>
   </data>
@@ -5171,6 +5177,9 @@
   <data name="Quota.HostedSharePoint.UseSharedSSL" xml:space="preserve">
     <value>Use shared SSL Root</value>
   </data>
+  <data name="Quota.HostedSharePointEnterprise.UseSharedSSL" xml:space="preserve">
+    <value>Use shared SSL Root</value>
+  </data>
   <data name="Quota.HostedSharePointServer.UseSharedSSL" xml:space="preserve">
     <value>Use shared SSL Root</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index 9164fa10..ccd7d555 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -385,26 +385,11 @@ namespace WebsitePanel.Portal.UserControls
 
         private void PrepareSharePointMenu(MenuItemCollection spItems)
         {                        
-            spItems.Add(CreateSharepointMenuItem("Text.SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
-            spItems.Add(CreateSharepointMenuItem("Text.StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
-            spItems.Add(CreateSharepointMenuItem("Text.StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
+            spItems.Add(CreateMenuItem("Text.SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("Text.StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("Text.StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
-        private MenuItem CreateSharepointMenuItem(string text, string key, string img)
-        {
-            MenuItem item = new MenuItem();
-            string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer";
-            item.Text = GetLocalizedString(text);
-            item.NavigateUrl = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGE_SERVER, "ItemID", ItemID.ToString(),
-                PortalUtils.SPACE_ID_PARAM + "=" + PackageId, DefaultPage.CONTROL_ID_PARAM + "=" + key, "moduleDefId=exchangeserver");
-
-            if (ShowImg)
-            {
-                item.ImageUrl = PortalUtils.GetThemedIcon(img);
-            }
-
-            return item;
-        }
 
         private void PrepareSharePointEnterpriseMenuRoot(MenuItemCollection items, string menuItemText)
         {
@@ -430,26 +415,11 @@ namespace WebsitePanel.Portal.UserControls
 
         private void PrepareSharePointEnterpriseMenu(MenuItemCollection spItems)
         {
-            spItems.Add(CreateSharepointEnterpriseMenuItem("Text.SiteCollections", "sharepoint_enterprise_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
-            spItems.Add(CreateSharepointEnterpriseMenuItem("Text.StorageUsage", "sharepoint_enterprise_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
-            spItems.Add(CreateSharepointEnterpriseMenuItem("Text.StorageLimits", "sharepoint_enterprise_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
+            spItems.Add(CreateMenuItem("Text.SiteCollections", "sharepoint_enterprise_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("Text.StorageUsage", "sharepoint_enterprise_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("Text.StorageLimits", "sharepoint_enterprise_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
-        private MenuItem CreateSharepointEnterpriseMenuItem(string text, string key, string img)
-        {
-            MenuItem item = new MenuItem();
-            string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer";
-            item.Text = GetLocalizedString(text);
-            item.NavigateUrl = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGE_SERVER, "ItemID", ItemID.ToString(),
-                PortalUtils.SPACE_ID_PARAM + "=" + PackageId, DefaultPage.CONTROL_ID_PARAM + "=" + key, "moduleDefId=exchangeserver");
-
-            if (ShowImg)
-            {
-                item.ImageUrl = PortalUtils.GetThemedIcon(img);
-            }
-
-            return item;
-        }
 
         private void PrepareOCSMenuRoot(MenuItemCollection items)
         {