From 3b6ee6427c78850c2a2e132477b227aa0ec5330a Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 12 Nov 2012 18:32:19 -0500
Subject: [PATCH] Undo some changes having to do with UPN when changing Primary
 Exchange Email Address. Changed Lync address to be based On UPN.

---
 .../WebsitePanel.Providers.HostedSolution/Exchange2007.cs       | 2 +-
 .../Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
index a338e30c..8f2f63e1 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
@@ -2591,7 +2591,7 @@ namespace WebsitePanel.Providers.HostedSolution
 				Command cmd = new Command("Set-Mailbox");
 				cmd.Parameters.Add("Identity", accountName);
 				cmd.Parameters.Add("PrimarySmtpAddress", primaryEmail);
-				//cmd.Parameters.Add("UserPrincipalName", primaryEmail);
+				cmd.Parameters.Add("UserPrincipalName", primaryEmail);
 				cmd.Parameters.Add("WindowsEmailAddress", primaryEmail);
 
 				ExecuteShellCommand(runSpace, cmd);
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
index 944788a5..ed619edb 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
@@ -435,7 +435,7 @@ namespace WebsitePanel.Providers.HostedSolution
                     cmd = new Command("Enable-CsUser");
                     cmd.Parameters.Add("Identity", userUpn);
                     cmd.Parameters.Add("RegistrarPool", PoolFQDN);
-                    cmd.Parameters.Add("SipAddressType", "EmailAddress");
+                    cmd.Parameters.Add("SipAddressType", "UserPrincipalName");
                     ExecuteShellCommand(runSpace, cmd);
 
                     transaction.RegisterNewCsUser(userUpn);