diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
index ab24ee94..e39c4b60 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx
@@ -4,7 +4,7 @@
         <td>
            
             <asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
-                RepeatLayout="Flow" EnableViewState="false"  RepeatColumns="6" ItemStyle-Height="28px"  SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
+                RepeatLayout="Flow" EnableViewState="false"  RepeatColumns="7" ItemStyle-Height="28px"  SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
                 <ItemStyle Wrap="False" />
                 <ItemTemplate >
                     <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
index d02021e4..91bf372d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs
@@ -50,7 +50,7 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
         {
             List<Tab> tabsList = new List<Tab>();
             tabsList.Add(CreateTab("edit_user", "Tab.General"));
-            tabsList.Add(CreateTab("organization_user_setup", "Tab.Setup"));
+            //tabsList.Add(CreateTab("organization_user_setup", "Tab.Setup"));
 
             // find selected menu item
             int idx = 0;