Following fixed and added:

User general settings added to the mailbox details tab
FirstName, Lastname added to the create user and mailbox forms
DisplayName is generated and editable based on provided first and last name
Issue fixed with mailbox details to show "[None]" if user has no plan assigned
Option added to the hosting plan to enable or disable the maintenance of
mailboxplans by tenants.

WebsitePanel/Database/install_db.sql

@@ -3917,6 +3917,8 @@ INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDe
 GO
 INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (368, 12, 1, N'Exchange2007.IsConsumer',N'Is Consumer Organization',1, 0 , NULL)
 GO
+INSERT [dbo].[Quotas]  ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (369, 12, 23,N'Exchange2007.EnablePlansEditing',N'Enable Plans Editing',1, 0 , NULL)
+GO
 INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (370, 41, 1, N'Lync.Users', N'Users',2 ,0 , NULL)
 GO
 INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (371,	41,	2,	N'Lync.Federation'	, N'Allow Federation',	1,	0, NULL)

WebsitePanel/Database/update_db.sql

@@ -173,6 +173,14 @@ INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDe
 END
 GO
 
+IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'Exchange2007.EnablePlansEditing')
+BEGIN
+INSERT [dbo].[Quotas]  ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (369, 12, 23,N'Exchange2007.EnablePlansEditing',N'Enable Plans Editing',1, 0 , NULL)
+END
+GO
+
+
+
 IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'Lync.Users')
 BEGIN
 INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (370, 41, 1, N'Lync.Users', N'Users',2 ,0 , NULL)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs

@@ -110,6 +110,7 @@ order by rg.groupOrder
         public const string EXCHANGE2007_MAXSENDMESSAGESIZEKB = "Exchange2007.MaxSendMessageSizeKB";  // Max Send Message Size
         public const string EXCHANGE2007_MAXRECEIVEMESSAGESIZEKB = "Exchange2007.MaxReceiveMessageSizeKB";  // Max Receive Message Size
         public const string EXCHANGE2007_ISCONSUMER = "Exchange2007.IsConsumer";  // Is Consumer Organization
+        public const string EXCHANGE2007_ENABLEDPLANSEDITING = "Exchange2007.EnablePlansEditing";  // Enabled plans editing
 		public const string MSSQL2000_DATABASES = "MsSQL2000.Databases";  // Databases
 		public const string MSSQL2000_USERS = "MsSQL2000.Users";  // Users
 		public const string MSSQL2000_MAXDATABASESIZE = "MsSQL2000.MaxDatabaseSize";  // Max Database Size

WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx

@@ -5005,6 +5005,9 @@
   <data name="Quota.Exchange2007.IsConsumer" xml:space="preserve">
     <value>Consumer Organization Support</value>
   </data>
+  <data name="Quota.Exchange2007.EnablePlansEditing" xml:space="preserve">
+    <value>Enable Mailbox Plans Editing</value>
+  </data>
   <data name="Error.LYNC_DELETE_DOMAIN" xml:space="preserve">
     <value>Error deleting organization domain name. See audit log for more details.</value>
   </data>
@@ -5144,6 +5147,9 @@
     <value>Failed to set default mailbox plan.</value>
   </data>
   <data name="Error.EXCHANGE_FAILED_TO_STAMP" xml:space="preserve">
-    <value>Failed to stamp mailbox with a mailbox plan.</value>
+    <value>Failed to stamp mailbox with a mailbox plan. See storage allocation.</value>
+  </data>
+  <data name="Error.EXCHANGE_SPECIFY_PLAN" xml:space="preserve">
+    <value>Specify a plan</value>
   </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/PanelRequest.cs

@@ -185,5 +185,11 @@ namespace WebsitePanel.Portal
             get { return HttpContext.Current.Request["Name"] != null
                 ? HttpContext.Current.Request["Name"].Trim() : ""; }
         }
+
+        public static string Context
+        {
+            get { return HttpContext.Current.Request["Context"]; }
+        }
+
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/UserControls/Tab.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebsitePanel.Portal.Code.UserControls
+{
+    public class Tab
+    {
+        string id;
+        string name;
+        string url;
+
+        public Tab(string id, string name, string url)
+        {
+            this.id = id;
+            this.name = name;
+            this.url = url;
+        }
+
+        public string Id
+        {
+            get { return this.id; }
+            set { this.id = value; }
+        }
+
+        public string Name
+        {
+            get { return this.name; }
+            set { this.name = value; }
+        }
+
+        public string Url
+        {
+            get { return this.url; }
+            set { this.url = value; }
+        }
+
+    }
+}
+

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx

@@ -11,6 +11,23 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
+<div runat="server" id="divWrapper">
+<script language="javascript" type="text/javascript">
+    function buildDisplayName() {
+        document.getElementById("<%= txtDisplayName.ClientID %>").value = '';
+
+        if (document.getElementById("<%= txtFirstName.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtFirstName.ClientID %>").value + ' ';
+
+        if (document.getElementById("<%= txtInitials.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtDisplayName.ClientID %>").value + document.getElementById("<%= txtInitials.ClientID %>").value + ' ';
+
+        if (document.getElementById("<%= txtLastName.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtDisplayName.ClientID %>").value + document.getElementById("<%= txtLastName.ClientID %>").value;
+    }
+</script>
+</div>
+
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Header">
@@ -54,6 +71,21 @@
                         				   
 					    
 						<table id="NewUserTable"  runat="server">
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locFirstName" runat="server" meta:resourcekey="locFirstName" Text="First Name: "></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtFirstName" runat="server" CssClass="TextBox100"  onKeyUp="buildDisplayName();"></asp:TextBox>
+								&nbsp;
+								<asp:Localize ID="locInitials" runat="server" meta:resourcekey="locInitials" Text="Initials:" />
+								<asp:TextBox ID="txtInitials" runat="server" MaxLength="6" CssClass="TextBox100"  onKeyUp="buildDisplayName();"></asp:TextBox>
+							</td>
+						</tr>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locLastName" runat="server" meta:resourcekey="locLastName" Text="Last Name: "></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtLastName" runat="server" CssClass="TextBox200"  onKeyUp="buildDisplayName();"></asp:TextBox>
+							</td>
+						</tr>
 						<tr>
 							<td class="FormLabel150"><asp:Localize ID="locDisplayName" runat="server" meta:resourcekey="locDisplayName" Text="Display Name: *"></asp:Localize></td>
 							<td>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.cs

@@ -134,6 +134,13 @@ namespace WebsitePanel.Portal.ExchangeServer
                     messageBox.ShowResultMessage(accountId);
                     return;
                 }
+                else
+                {
+                    if ((!string.IsNullOrEmpty(txtFirstName.Text)) | (!string.IsNullOrEmpty(txtLastName.Text)) | (!string.IsNullOrEmpty(txtInitials.Text)))
+                    {
+                        SetUserAttributes(accountId);
+                    }
+                }
 
                 Response.Redirect(EditUrl("AccountID", accountId.ToString(), "mailbox_settings",
                     "SpaceID=" + PanelSecurity.PackageId.ToString(),
@@ -145,6 +152,44 @@ namespace WebsitePanel.Portal.ExchangeServer
             }
         }
 
+        private void SetUserAttributes(int accountId)
+        {
+            OrganizationUser user = ES.Services.Organizations.GetUserGeneralSettings(PanelRequest.ItemID, accountId);
+
+            ES.Services.Organizations.SetUserGeneralSettings(
+                    PanelRequest.ItemID, accountId,
+                    txtDisplayName.Text,
+                    null,
+                    false,
+                    user.Disabled,
+                    user.Locked,
+
+                    txtFirstName.Text,
+                    txtInitials.Text,
+                    txtLastName.Text,
+
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    user.ExternalEmail,
+                    txtSubscriberNumber.Text);
+        }
+
 
 
         protected void rbtnUserExistingUser_CheckedChanged(object sender, EventArgs e)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs

@@ -21,6 +21,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
+        /// <summary>
+        /// divWrapper control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWrapper;
+        
         /// <summary>
         /// breadcrumb control.
         /// </summary>
@@ -111,6 +120,60 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTable NewUserTable;
         
+        /// <summary>
+        /// locFirstName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locFirstName;
+        
+        /// <summary>
+        /// txtFirstName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtFirstName;
+        
+        /// <summary>
+        /// locInitials control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locInitials;
+        
+        /// <summary>
+        /// txtInitials control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtInitials;
+        
+        /// <summary>
+        /// locLastName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locLastName;
+        
+        /// <summary>
+        /// txtLastName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtLastName;
+        
         /// <summary>
         /// locDisplayName control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs

@@ -67,7 +67,15 @@ namespace WebsitePanel.Portal.ExchangeServer
                 ExchangeAccount account = ES.Services.ExchangeServer.GetAccount(PanelRequest.ItemID, PanelRequest.AccountID);
                 chkPmmAllowed.Checked = (account.MailboxManagerActions & MailboxManagerActions.GeneralSettings) > 0;
 
-                mailboxPlanSelector.MailboxPlanId = account.MailboxPlanId.ToString();
+                if (account.MailboxPlanId == 0)
+                {
+                    mailboxPlanSelector.AddNone = true;
+                    mailboxPlanSelector.MailboxPlanId = "-1";
+                }
+                else
+                {
+                    mailboxPlanSelector.MailboxPlanId = account.MailboxPlanId.ToString();
+                }
 
                 mailboxSize.QuotaUsedValue = Convert.ToInt32(stats.TotalSize / 1024 / 1024);
                 mailboxSize.QuotaValue = (int)Math.Round((double)(stats.MaxSize / 1024 / 1024));
@@ -92,6 +100,12 @@ namespace WebsitePanel.Portal.ExchangeServer
 
             try
             {
+                if (mailboxPlanSelector.MailboxPlanId == "-1")
+                {
+                    messageBox.ShowErrorMessage("EXCHANGE_SPECIFY_PLAN");
+                    return;
+                }
+
                 int result = ES.Services.ExchangeServer.SetMailboxGeneralSettings(
                     PanelRequest.ItemID, PanelRequest.AccountID,
                     chkHideAddressBook.Checked,

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs

@@ -43,7 +43,22 @@ namespace WebsitePanel.Portal.ExchangeServer
                 BindMailboxPlans();
 
                 txtStatus.Visible = false;
+
+                if (PanelSecurity.LoggedUser.Role == UserRole.User)
+                {
+                    PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+                    if (cntx.Quotas.ContainsKey(Quotas.EXCHANGE2007_ENABLEDPLANSEDITING))
+                    {
+                        if (cntx.Quotas[Quotas.EXCHANGE2007_ENABLEDPLANSEDITING].QuotaAllocatedValue != 1)
+                        {
+                            gvMailboxPlans.Columns[2].Visible = false;
+                            btnAddMailboxPlan.Enabled = btnAddMailboxPlan.Visible = false;
+                        }
+                    }
+                }
+
             }
+
         }
 
         public string GetMailboxPlanDisplayUrl(string MailboxPlanId)
@@ -68,7 +83,6 @@ namespace WebsitePanel.Portal.ExchangeServer
             }
 
             btnSave.Enabled = (gvMailboxPlans.Rows.Count >= 1);
-
         }
 
         public string IsChecked(bool val)
@@ -141,8 +155,10 @@ namespace WebsitePanel.Portal.ExchangeServer
                     int result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(PanelRequest.ItemID, a.AccountId, Convert.ToInt32(mailboxPlanSelectorTarget.MailboxPlanId));
                     if (result < 0)
                     {
+                        BindMailboxPlans();
                         txtStatus.Text = "Error: " + a.AccountName;
-                        break;
+                        ShowErrorMessage("EXCHANGE_FAILED_TO_STAMP");
+                        return;
                     }
                 }
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx

@@ -10,6 +10,23 @@
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
+<div runat="server" id="divWrapper">
+<script language="javascript" type="text/javascript">
+    function buildDisplayName() {
+        document.getElementById("<%= txtDisplayName.ClientID %>").value = '';
+
+        if (document.getElementById("<%= txtFirstName.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtFirstName.ClientID %>").value + ' ';
+
+        if (document.getElementById("<%= txtInitials.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtDisplayName.ClientID %>").value + document.getElementById("<%= txtInitials.ClientID %>").value + ' ';
+
+        if (document.getElementById("<%= txtLastName.ClientID %>").value != '')
+            document.getElementById("<%= txtDisplayName.ClientID %>").value = document.getElementById("<%= txtDisplayName.ClientID %>").value + document.getElementById("<%= txtLastName.ClientID %>").value;
+    }
+</script>
+</div>
+
 <div id="ExchangeContainer">
 	<div class="Module">
 		<div class="Header">
@@ -27,6 +44,21 @@
 				<div class="FormBody">
 				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
 					<table>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locFirstName" runat="server" meta:resourcekey="locFirstName" Text="First Name: "></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtFirstName" runat="server" CssClass="TextBox100" onKeyUp="buildDisplayName();" ></asp:TextBox>
+								&nbsp;
+								<asp:Localize ID="locInitials" runat="server" meta:resourcekey="locInitials" Text="Initials:" />
+								<asp:TextBox ID="txtInitials" runat="server" MaxLength="6" CssClass="TextBox100" onKeyUp="buildDisplayName();"></asp:TextBox>
+							</td>
+						</tr>
+						<tr>
+							<td class="FormLabel150"><asp:Localize ID="locLastName" runat="server" meta:resourcekey="locLastName" Text="Last Name: "></asp:Localize></td>
+							<td>
+								<asp:TextBox ID="txtLastName" runat="server" CssClass="TextBox200" onKeyUp="buildDisplayName();"></asp:TextBox>
+							</td>
+						</tr>
 						<tr>
 							<td class="FormLabel150"><asp:Localize ID="locDisplayName" runat="server" meta:resourcekey="locDisplayName" Text="Display Name: *"></asp:Localize></td>
 							<td>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx.cs

@@ -29,6 +29,7 @@
 using System;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.HostedSolution;
 
 
 namespace WebsitePanel.Portal.HostedSolution
@@ -103,15 +104,61 @@ namespace WebsitePanel.Portal.HostedSolution
                     messageBox.ShowResultMessage(accountId);
                     return;
                 }
+                else
+                {
+                    if ((!string.IsNullOrEmpty(txtFirstName.Text)) | (!string.IsNullOrEmpty(txtLastName.Text)) | (!string.IsNullOrEmpty(txtInitials.Text)))
+                    {
+                        SetUserAttributes(accountId);
+                    }
+                }
 
                 Response.Redirect(EditUrl("AccountID", accountId.ToString(), "edit_user",
                     "SpaceID=" + PanelSecurity.PackageId,
-                    "ItemID=" + PanelRequest.ItemID));
+                    "ItemID=" + PanelRequest.ItemID,
+                    "Context=User"));
             }
             catch (Exception ex)
             {
                 messageBox.ShowErrorMessage("EXCHANGE_CREATE_MAILBOX", ex);
             }
         }
+
+        private void SetUserAttributes(int accountId)
+        {
+            OrganizationUser user = ES.Services.Organizations.GetUserGeneralSettings(PanelRequest.ItemID, accountId);
+
+            ES.Services.Organizations.SetUserGeneralSettings(
+                    PanelRequest.ItemID, accountId,
+                    txtDisplayName.Text,
+                    null,
+                    false,
+                    user.Disabled,
+                    user.Locked,
+
+                    txtFirstName.Text,
+                    txtInitials.Text,
+                    txtLastName.Text,
+
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    user.ExternalEmail,
+                    txtSubscriberNumber.Text);
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx.designer.cs

@@ -21,6 +21,15 @@ namespace WebsitePanel.Portal.HostedSolution {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
+        /// <summary>
+        /// divWrapper control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWrapper;
+        
         /// <summary>
         /// breadcrumb control.
         /// </summary>
@@ -66,6 +75,60 @@ namespace WebsitePanel.Portal.HostedSolution {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
+        /// <summary>
+        /// locFirstName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locFirstName;
+        
+        /// <summary>
+        /// txtFirstName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtFirstName;
+        
+        /// <summary>
+        /// locInitials control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locInitials;
+        
+        /// <summary>
+        /// txtInitials control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtInitials;
+        
+        /// <summary>
+        /// locLastName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locLastName;
+        
+        /// <summary>
+        /// txtLastName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtLastName;
+        
         /// <summary>
         /// locDisplayName control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx

@@ -11,6 +11,7 @@
 
 
 
+<%@ Register src="UserControls/UserTabs.ascx" tagname="UserTabs" tagprefix="uc1" %>
 <%@ Register src="UserControls/MailboxTabs.ascx" tagname="MailboxTabs" tagprefix="uc1" %>
 
 
@@ -35,11 +36,10 @@
                 </div>
 
 				<div class="FormBody">
-                    <uc1:MailboxTabs ID="MailboxTabs1" runat="server" IsADUserTabs="true" SelectedTab="edit_user" />
+                    <uc1:UserTabs ID="UserTabsId" runat="server" SelectedTab="edit_user" />
+                    <uc1:MailboxTabs ID="MailboxTabsId" runat="server" SelectedTab="edit_user" />
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
                     
-					
-                    
 					<table>
 						<tr>
 							<td class="FormLabel150"><asp:Localize ID="locDisplayName" runat="server" meta:resourcekey="locDisplayName" Text="Display Name: *"></asp:Localize></td>
@@ -84,7 +84,7 @@
 						<tr>
 							<td class="FormLabel150"><asp:Localize ID="locLastName" runat="server" meta:resourcekey="locLastName" Text="Last Name:"></asp:Localize></td>
 							<td>
-								<asp:TextBox ID="txtLastName" runat="server" CssClass="TextBox100"></asp:TextBox>
+								<asp:TextBox ID="txtLastName" runat="server" CssClass="TextBox200"></asp:TextBox>
 							</td>
 						</tr>
 						<tr>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.cs

@@ -42,6 +42,8 @@ namespace WebsitePanel.Portal.HostedSolution
             {
                 BindSettings();
 
+                MailboxTabsId.Visible = (PanelRequest.Context == "Mailbox");
+                UserTabsId.Visible = (PanelRequest.Context == "User");
             }
         }
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.designer.cs

@@ -67,13 +67,22 @@ namespace WebsitePanel.Portal.HostedSolution {
         protected global::System.Web.UI.WebControls.Literal litDisplayName;
         
         /// <summary>
-        /// MailboxTabs1 control.
+        /// UserTabsId control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.MailboxTabs MailboxTabs1;
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.UserTabs UserTabsId;
+        
+        /// <summary>
+        /// MailboxTabsId control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.MailboxTabs MailboxTabsId;
         
         /// <summary>
         /// messageBox control.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs

@@ -74,7 +74,8 @@ namespace WebsitePanel.Portal.HostedSolution
         {
             return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "edit_user",
                     "AccountID=" + accountId,
-                    "ItemID=" + PanelRequest.ItemID);
+                    "ItemID=" + PanelRequest.ItemID,
+                    "Context=User");
         }
 
         protected void odsAccountsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/MailboxTabs.ascx.resx

@@ -123,25 +123,25 @@
   <data name="Tab.Advanced" xml:space="preserve">
     <value>Advanced</value>
   </data>
+  <data name="Tab.General" xml:space="preserve">
+    <value>General</value>
+  </data>
   <data name="Tab.Mailflow" xml:space="preserve">
     <value>Mail Flow Settings</value>
   </data>
+  <data name="Tab.Mobile" xml:space="preserve">
+    <value>Mobile Devices</value>
+  </data>
   <data name="Tab.Permissions" xml:space="preserve">
     <value>Permissions</value>
   </data>
   <data name="Tab.Settings" xml:space="preserve">
-    <value>General</value>
+    <value>Settings</value>
   </data>
   <data name="Tab.Setup" xml:space="preserve">
     <value>Setup Instructions</value>
   </data>
-  <data name="Tab.Mobile" xml:space="preserve">
-    <value>Mobile Devices</value>
-  </data>
   <data name="Tab.Spam" xml:space="preserve">
     <value>Spam</value>
   </data>
-  <data name="Tab.Mailbox" xml:space="preserve">
-    <value>Mailbox</value>
-  </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/UserTabs.ascx.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Tab.Advanced" xml:space="preserve">
+    <value>Advanced</value>
+  </data>
+  <data name="Tab.General" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="Tab.Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Tab.Setup" xml:space="preserve">
+    <value>Setup Instructions</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/ContactTabs.ascx.cs

@@ -37,6 +37,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
+using WebsitePanel.Portal.Code.UserControls;
 
 namespace WebsitePanel.Portal.ExchangeServer.UserControls
 {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/DistributionListTabs.ascx.cs

@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using WebsitePanel.Portal.Code.UserControls;
 
 namespace WebsitePanel.Portal.ExchangeServer.UserControls
 {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx.cs

@@ -28,44 +28,12 @@
 
 using System;
 using System.Collections.Generic;
+using WebsitePanel.Portal.Code.UserControls;
 
 namespace WebsitePanel.Portal.ExchangeServer.UserControls
 {
-    class Tab
-    {
-        string id;
-        string name;
-        string url;
-
-        public Tab(string id, string name, string url)
-        {
-            this.id = id;
-            this.name = name;
-            this.url = url;
-        }
-
-        public string Id
-        {
-            get { return this.id; }
-            set { this.id = value; }
-        }
-
-        public string Name
-        {
-            get { return this.name; }
-            set { this.name = value; }
-        }
-
-        public string Url
-        {
-            get { return this.url; }
-            set { this.url = value; }
-        }
-    }
-
     public partial class MailboxTabs : WebsitePanelControlBase
     {
-        public const string ADUserTabs = "ADUserTabs";
         private string selectedTab;
         public string SelectedTab
         {
@@ -73,24 +41,17 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             set { selectedTab = value; }
         }
 
-        public bool IsADUserTabs
-        {
-            get { return ViewState[ADUserTabs] != null ? Utils.ParseBool(ViewState[ADUserTabs].ToString(), false) : false; }
-            set { ViewState[ADUserTabs] = value; }
-        }
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            if (IsADUserTabs)
+            BindTabs();
-                BindAdUserTabs();
-            else
-                BindTabs();
         }
 
         private void BindTabs()
         {
             List<Tab> tabsList = new List<Tab>();
-            tabsList.Add(CreateTab("mailbox_settings", "Tab.Mailbox"));
+            tabsList.Add(CreateTab("edit_user", "Tab.General"));
+            tabsList.Add(CreateTab("mailbox_settings", "Tab.Settings"));
             tabsList.Add(CreateTab("mailbox_addresses", "Tab.Addresses"));
             tabsList.Add(CreateTab("mailbox_mailflow", "Tab.Mailflow"));
             tabsList.Add(CreateTab("mailbox_permissions", "Tab.Permissions"));
@@ -99,25 +60,6 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             //tabsList.Add(CreateTab("mailbddox_spam", "Tab.Spam"));
 
 
-            // find selected menu item
-            int idx = 0;
-            foreach (Tab tab in tabsList)
-            {
-                if (String.Compare(tab.Id, SelectedTab, true) == 0)
-                    break;
-                idx++;
-            }
-            dlTabs.SelectedIndex = idx;
-
-            dlTabs.DataSource = tabsList;
-            dlTabs.DataBind();
-        }
-
-        private void BindAdUserTabs()
-        {
-            List<Tab> tabsList = new List<Tab>();
-            tabsList.Add(CreateTab("edit_user", "Tab.Settings"));
-            tabsList.Add(CreateTab("organization_user_setup", "Tab.Setup"));
 
             // find selected menu item
             int idx = 0;
@@ -138,7 +80,8 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             return new Tab(id, GetLocalizedString(text),
                 HostModule.EditUrl("AccountID", PanelRequest.AccountID.ToString(), id,
                 "SpaceID=" + PanelSecurity.PackageId.ToString(),
-                "ItemID=" + PanelRequest.ItemID.ToString()));
+                "ItemID=" + PanelRequest.ItemID.ToString(),
+                "Context=Mailbox"));
         }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxTabs.ascx.designer.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated. 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/PublicFolderTabs.ascx.cs

@@ -37,6 +37,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
+using WebsitePanel.Portal.Code.UserControls;
 
 namespace WebsitePanel.Portal.ExchangeServer.UserControls
 {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx

@@ -0,0 +1,27 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserTabs.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.UserTabs" %>
+<table width="100%" cellpadding="0" cellspacing="1">
+    <tr>
+        <td>
+            
+            <asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
+                RepeatLayout="Flow" EnableViewState="false"  RepeatColumns="6" ItemStyle-Height="28px"  SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
+                <ItemStyle Wrap="False" />
+                <ItemTemplate >
+                    <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </ItemTemplate>
+                <SelectedItemStyle Wrap="False" />
+                <SelectedItemTemplate>
+                    <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" NavigateUrl='<%# Eval("Url") %>'>
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </SelectedItemTemplate>
+                <SeparatorTemplate>
+                    &nbsp;
+                </SeparatorTemplate>
+            </asp:DataList>
+        </td>
+    </tr>
+</table>
+<br />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.cs

@@ -0,0 +1,78 @@
+// Copyright (c) 2012, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Collections.Generic;
+using WebsitePanel.Portal.Code.UserControls;
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+    public partial class UserTabs : WebsitePanelControlBase
+    {
+        private string selectedTab;
+        public string SelectedTab
+        {
+            get { return selectedTab; }
+            set { selectedTab = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindTabs();
+        }
+
+        private void BindTabs()
+        {
+            List<Tab> tabsList = new List<Tab>();
+            tabsList.Add(CreateTab("edit_user", "Tab.General"));
+            tabsList.Add(CreateTab("organization_user_setup", "Tab.Setup"));
+
+            // find selected menu item
+            int idx = 0;
+            foreach (Tab tab in tabsList)
+            {
+                if (String.Compare(tab.Id, SelectedTab, true) == 0)
+                    break;
+                idx++;
+            }
+            dlTabs.SelectedIndex = idx;
+
+            dlTabs.DataSource = tabsList;
+            dlTabs.DataBind();
+        }
+
+        private Tab CreateTab(string id, string text)
+        {
+            return new Tab(id, GetLocalizedString(text),
+                HostModule.EditUrl("AccountID", PanelRequest.AccountID.ToString(), id,
+                "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                "ItemID=" + PanelRequest.ItemID.ToString(),
+                "Context=User"));
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/UserTabs.ascx.designer.cs

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class UserTabs {
+        
+        /// <summary>
+        /// dlTabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DataList dlTabs;
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj

@@ -200,6 +200,7 @@
     <Compile Include="Code\ReportingServices\FileSystemReportLocalizer.cs" />
     <Compile Include="Code\ReportingServices\IResourceStorage.cs" />
     <Compile Include="Code\ReportingServices\ReportingServicesUtils.cs" />
+    <Compile Include="Code\UserControls\Tab.cs" />
     <Compile Include="ExchangeServer\ExchangeAddMailboxPlan.ascx.cs">
       <DependentUpon>ExchangeAddMailboxPlan.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -225,6 +226,13 @@
     <Compile Include="ExchangeServer\UserControls\MailboxPlanSelector.ascx.designer.cs">
       <DependentUpon>MailboxPlanSelector.ascx</DependentUpon>
     </Compile>
+    <Compile Include="ExchangeServer\UserControls\UserTabs.ascx.cs">
+      <DependentUpon>UserTabs.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\UserTabs.ascx.designer.cs">
+      <DependentUpon>UserTabs.ascx</DependentUpon>
+    </Compile>
     <Compile Include="Lync\LyncAddFederationDomain.ascx.cs">
       <DependentUpon>LyncAddFederationDomain.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3754,6 +3762,7 @@
     <Content Include="ExchangeServer\ExchangeMailboxPlans.ascx" />
     <Content Include="ExchangeServer\UserControls\AccountsListWithPermissions.ascx" />
     <Content Include="ExchangeServer\UserControls\MailboxPlanSelector.ascx" />
+    <Content Include="ExchangeServer\UserControls\UserTabs.ascx" />
     <Content Include="Lync\LyncAddFederationDomain.ascx" />
     <Content Include="Lync\LyncAddLyncUserPlan.ascx" />
     <Content Include="Lync\LyncCreateUser.ascx" />
@@ -4894,6 +4903,7 @@
     <Content Include="Lync\App_LocalResources\LyncUserPlans.ascx.resx" />
     <Content Include="Lync\App_LocalResources\LyncUsers.ascx.resx" />
     <Content Include="ProviderControls\App_LocalResources\Lync_Settings.ascx.resx" />
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\UserTabs.ascx.resx" />
     <EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>