diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
index 486e2519..7735e310 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
@@ -2158,7 +2158,8 @@ namespace WebsitePanel.EnterpriseServer
 				List<string> toDelete = new List<string>();
 				foreach (string emailAddress in emailAddresses)
 				{
-					if (String.Compare(account.PrimaryEmailAddress, emailAddress, true) != 0)
+					if ((String.Compare(account.PrimaryEmailAddress, emailAddress, true) != 0) &
+                        (String.Compare(account.UserPrincipalName, emailAddress, true) != 0))
 						toDelete.Add(emailAddress);
 				}