diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx
index 44b0e2d7..e5fc9507 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx
@@ -57,7 +57,7 @@
 								<ItemTemplate>
 									<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
 									<asp:LinkButton ID="cmdSelectAccount" CommandName="SelectAccount"
-									CommandArgument='<%# Eval("AccountName").ToString() + "|" + Eval("DisplayName").ToString()+ "|" + Eval("PrimaryEmailAddress")+ "|" + Eval("AccountId")%>'
+									CommandArgument='<%# Eval("AccountName").ToString() + "^" + Eval("DisplayName").ToString()+ "^" + Eval("PrimaryEmailAddress")+ "^" + Eval("AccountId")%>'
 									runat="server" Text='<%# Eval("DisplayName") %>'></asp:LinkButton>
 								</ItemTemplate>
 							</asp:TemplateField>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx.cs
index 655d8c20..8e4eb3c2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxSelector.ascx.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using WebsitePanel.Providers.HostedSolution;
+using System.Text.RegularExpressions;
 
 namespace WebsitePanel.Portal.ExchangeServer.UserControls
 {
@@ -218,7 +219,8 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
         {
             if (e.CommandName == "SelectAccount")
             {
-                string[] parts = e.CommandArgument.ToString().Split('|');
+
+                string[] parts = e.CommandArgument.ToString().Split('^');
                 ExchangeAccount account = new ExchangeAccount();
                 account.AccountName = parts[0];
                 account.DisplayName = parts[1];