diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
index ea488c1d..0f2f1e19 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
@@ -127,6 +127,9 @@
     <value>Distribution Lists</value>
   </data>
   <data name="Text.DomainNames" xml:space="preserve">
+    <value>Domains</value>
+  </data>
+  <data name="Text.ExchangeDomainNames" xml:space="preserve">
     <value>Accepted Domains</value>
   </data>
   <data name="Text.CRMOrganization" xml:space="preserve">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
index d0817799..1b7569c5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
@@ -138,10 +138,11 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                     exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans"));
 
             if (!hideItems)
-                if (Utils.CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))
-                    exchangeGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains"));
+                if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
+                    exchangeGroup.MenuItems.Add(CreateMenuItem("ExchangeDomainNames", "domains"));
 
             if (!hideItems)
+                if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
                 exchangeGroup.MenuItems.Add(CreateMenuItem("StorageUsage", "storage_usage"));
 
             if (exchangeGroup.MenuItems.Count > 0)
@@ -164,8 +165,12 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             if (!hideItems)
             {
                 MenuGroup organizationGroup = new MenuGroup(GetLocalizedString("Text.OrganizationGroup"), imagePath + "company24.png");
-                //if (CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))
-                //    organizationGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains"));
+                
+                if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx) == false)
+                {
+                    if (CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))
+                        organizationGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains"));
+                }
                 if (Utils.CheckQouta(Quotas.ORGANIZATION_USERS, cntx))
                     organizationGroup.MenuItems.Add(CreateMenuItem("Users", "users"));