diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 68a99329..6d18f699 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -9492,4 +9492,14 @@ UPDATE [dbo].[Quotas] SET QuotaName = 'HostedSharePointEnterprise.UseSharedSSL'
 GO
 
 UPDATE [dbo].[ServiceItemTypes] SET DisplayName = 'SharePointEnterpriseSiteCollection' WHERE DisplayName = 'SharePointSiteCollection'
-GO
\ No newline at end of file
+GO
+
+
+IF EXISTS (SELECT * FROM Providers WHERE ProviderName = 'HostedSharePoint2013' AND GroupID IN (Select GroupID FROM ResourceGroups WHERE GroupName = 'Sharepoint Enterprise Server'))
+BEGIN
+	DECLARE @group_id INT
+	SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'Sharepoint Enterprise Server'
+	DELETE FROM Providers WHERE ProviderName = 'HostedSharePoint2013' AND GroupID = @group_id
+END
+
+GO
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index c9e880a7..df9b4cc8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -239,7 +239,7 @@
   </data>
   <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
     <value>Hosted Organization - SharePoint Enterprise Server</value>
-  </data>  
+  </data>
   <data name="Text.SiteCollections" xml:space="preserve">
     <value>Sharepoint Sites</value>
   </data>
@@ -250,7 +250,7 @@
     <value>Storage Usage</value>
   </data>
   <data name="Text.Users" xml:space="preserve">
-    <value>Users</value>
+    <value>Users (User Organization)</value>
   </data>
   <data name="Text.CreateOrganization" xml:space="preserve">
     <value>Create Organization</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEnterpriseSiteCollections.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEnterpriseSiteCollections.ascx.cs
index 1e8428bc..0573f900 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEnterpriseSiteCollections.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEnterpriseSiteCollections.ascx.cs
@@ -58,7 +58,7 @@ namespace WebsitePanel.Portal
 
 			siteCollectionsQuota.QuotaUsedValue = stats.CreatedSharePointEnterpriseSiteCollections;
 			siteCollectionsQuota.QuotaValue = stats.AllocatedSharePointEnterpriseSiteCollections;
-            if (stats.AllocatedSharePointSiteCollections != -1) siteCollectionsQuota.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
+            if (stats.AllocatedSharePointEnterpriseSiteCollections != -1) siteCollectionsQuota.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
 		}
 
 		protected void btnCreateSiteCollection_Click(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index ccd7d555..d493bed7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -96,10 +96,10 @@ namespace WebsitePanel.Portal.UserControls
 
             //SharePoint menu group;
             if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointFoundationServer))
-                PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointFoundationServerGroup"));
+                PrepareSharePointMenuRoot(items);
 
             if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
-                PrepareSharePointEnterpriseMenuRoot(items, GetLocalizedString("Text.SharePointEnterpriseServerGroup"));
+                PrepareSharePointEnterpriseMenuRoot(items);
 
             //CRM Menu
             if (Cntx.Groups.ContainsKey(ResourceGroups.HostedCRM2013))
@@ -362,7 +362,7 @@ namespace WebsitePanel.Portal.UserControls
             bbItems.Add(CreateMenuItem("BlackBerryUsers", "blackberry_users", @"Icons/blackberry_users_48.png"));
         }
 
-        private void PrepareSharePointMenuRoot(MenuItemCollection items, string menuItemText)
+        private void PrepareSharePointMenuRoot(MenuItemCollection items)
         {
             if (ShortMenu)
             {
@@ -370,7 +370,7 @@ namespace WebsitePanel.Portal.UserControls
             }
             else
             {
-                MenuItem item = new MenuItem(menuItemText, "", "", null);
+                MenuItem item = new MenuItem(GetLocalizedString("Text.SharePointFoundationServerGroup"), "", "", null);
 
                 item.Selectable = false;
 
@@ -385,13 +385,13 @@ namespace WebsitePanel.Portal.UserControls
 
         private void PrepareSharePointMenu(MenuItemCollection spItems)
         {                        
-            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"));
+            spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
 
-        private void PrepareSharePointEnterpriseMenuRoot(MenuItemCollection items, string menuItemText)
+        private void PrepareSharePointEnterpriseMenuRoot(MenuItemCollection items)
         {
             if (ShortMenu)
             {
@@ -399,7 +399,7 @@ namespace WebsitePanel.Portal.UserControls
             }
             else
             {
-                MenuItem item = new MenuItem(menuItemText, "", "", null);
+                MenuItem item = new MenuItem(GetLocalizedString("Text.SharePointEnterpriseServerGroup"), "", "", null);
 
                 item.Selectable = false;
 
@@ -415,9 +415,9 @@ namespace WebsitePanel.Portal.UserControls
 
         private void PrepareSharePointEnterpriseMenu(MenuItemCollection spItems)
         {
-            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"));
+            spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_enterprise_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_enterprise_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_enterprise_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
 
@@ -556,8 +556,7 @@ namespace WebsitePanel.Portal.UserControls
             MenuItem item = new MenuItem();
 
             item.Text = GetLocalizedString("Text." + text);
-            item.NavigateUrl = PortalUtils.EditUrl("ItemID", ItemID.ToString(), key,
-                "SpaceID=" + PackageId);
+            item.NavigateUrl = PortalUtils.EditUrl("ItemID", ItemID.ToString(), key, "SpaceID=" + PackageId);
 
             if (ShowImg)
             {