diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 958dac68..9c756686 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -6956,4 +6956,11 @@ AS
 		
 	RETURN @Result'
 END
-GO
\ No newline at end of file
+GO
+
+
+IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'HostedSolution.AllowChangeUPN')
+BEGIN
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (230,	13,	4,	N'HostedSolution.AllowChangeUPN', N'Allow to Change UserPrincipalName',	1,	0, NULL)
+END
+GO
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
index 8090dd31..7541d383 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
@@ -150,6 +150,7 @@ order by rg.groupOrder
         public const string ORGANIZATIONS = "HostedSolution.Organizations";
         public const string ORGANIZATION_USERS = "HostedSolution.Users";
         public const string ORGANIZATION_DOMAINS = "HostedSolution.Domains";
+        public const string ORGANIZATION_ALLOWCHANGEUPN = "HostedSolution.AllowChangeUPN";
         public const string CRM_USERS = "HostedCRM.Users";
         public const string CRM_ORGANIZATION = "HostedCRM.Organization";
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
index 332a50aa..2c0c761d 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
@@ -1817,7 +1817,8 @@ namespace WebsitePanel.EnterpriseServer
                 exchange.DisableMailbox(account.AccountName);
 
                 account.AccountType = ExchangeAccountType.User;                
-                account.MailEnabledPublicFolder = false;                                
+                account.MailEnabledPublicFolder = false;
+                account.AccountPassword = null;
                 UpdateAccount(account);
                 DataProvider.DeleteUserEmailAddresses(account.AccountId, account.PrimaryEmailAddress);
                 
@@ -2129,6 +2130,7 @@ namespace WebsitePanel.EnterpriseServer
                 }
 
 				// save account
+                account.AccountPassword = null;
 				UpdateAccount(account);
 
 				return 0;
@@ -2357,6 +2359,7 @@ namespace WebsitePanel.EnterpriseServer
                 else account.MailboxManagerActions &= ~action;
 
                 // update account
+                account.AccountPassword = null;
                 UpdateAccount(account);
 
                 return 0;
@@ -3193,6 +3196,7 @@ namespace WebsitePanel.EnterpriseServer
                 // update account
                 account.DisplayName = displayName;
                 account.PrimaryEmailAddress = emailAddress;
+                account.AccountPassword = null;
                 UpdateAccount(account);
 
                 return 0;
@@ -3521,6 +3525,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 // update account
                 account.DisplayName = displayName;
+                account.AccountPassword = null;
                 UpdateAccount(account);
 
                 return 0;
@@ -3741,6 +3746,7 @@ namespace WebsitePanel.EnterpriseServer
                     addressLists.ToArray());
 
                 // save account
+                account.AccountPassword = null;
                 UpdateAccount(account);
 
                 return 0;
@@ -4143,6 +4149,7 @@ namespace WebsitePanel.EnterpriseServer
 				account.AccountName = accountName;
 				account.MailEnabledPublicFolder = true;
 				account.PrimaryEmailAddress = email;
+                account.AccountPassword = null;
 				UpdateAccount(account);
 
 				// register e-mail
@@ -4195,6 +4202,7 @@ namespace WebsitePanel.EnterpriseServer
 				// update and save account
 				account.MailEnabledPublicFolder = false;
 				account.PrimaryEmailAddress = "";
+                account.AccountPassword = null;
 				UpdateAccount(account);
 
 
@@ -4314,6 +4322,7 @@ namespace WebsitePanel.EnterpriseServer
 				{
 					// rename original folder
 					account.DisplayName = newFullName;
+                    account.AccountPassword = null;
 					UpdateAccount(account);
 
 					// rename nested folders
@@ -4531,6 +4540,7 @@ namespace WebsitePanel.EnterpriseServer
 					emailAddress);
 
 				// save account
+                account.AccountPassword = null;
 				UpdateAccount(account);
 
 				return 0;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
index be56a17f..bcb9d185 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
@@ -1735,7 +1735,7 @@ namespace WebsitePanel.EnterpriseServer
                 if (!String.IsNullOrEmpty(password))
                     account.AccountPassword = CryptoUtils.Encrypt(password);
                 else 
-                    account.AccountPassword = string.Empty;
+                    account.AccountPassword = null;
 
                 UpdateAccount(account);
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 107773db..30363019 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3263,6 +3263,9 @@
   <data name="Quota.HostedSolution.Users" xml:space="preserve">
     <value>Users per Organization</value>
   </data>
+  <data name="Quota.HostedSolution.AllowChangeUPN" xml:space="preserve">
+    <value>Allow to Change UserPrincipalName</value>
+  </data>
   <data name="Quota.HostedSolution.Domains" xml:space="preserve">
     <value>Domains per Organization</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx
index 4ee2563c..cc4d2ce4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx
@@ -8,6 +8,7 @@
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EmailAddress.ascx" TagName="EmailAddress" TagPrefix="wsp" %>
 
 
 
@@ -43,7 +44,10 @@
 					<table>
 						<tr>
 						    <td class="FormLabel150"> <asp:Localize ID="locUserPrincipalName" runat="server" meta:resourcekey="locUserPrincipalName" Text="Login Name:"></asp:Localize></td>
-						    <td><asp:Label runat="server" ID="lblUserPrincipalName" /></td>
+						    <td>
+                                <asp:Label runat="server" ID="lblUserPrincipalName" />
+                                <wsp:EmailAddress id="upn" runat="server" ValidationGroup="CreateMailbox"></wsp:EmailAddress>
+						    </td>
 						</tr>					   
 
 						<tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.cs
index 627d7d89..16bb35ec 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.cs
@@ -120,6 +120,32 @@ namespace WebsitePanel.Portal.HostedSolution
                     }
                 }
 
+
+                if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATION_ALLOWCHANGEUPN))
+                {
+                    if (cntx.Quotas[Quotas.ORGANIZATION_ALLOWCHANGEUPN].QuotaAllocatedValue != 1)
+                    {
+                        lblUserPrincipalName.Visible = true;
+                        upn.Visible = false;
+                    }
+                    else
+                    {
+                        lblUserPrincipalName.Visible = false;
+                        upn.Visible = true;
+                        if (!string.IsNullOrEmpty(user.UserPrincipalName))
+                        {
+                            string[] Tmp = user.UserPrincipalName.Split('@');
+                            upn.AccountName = Tmp[0];
+
+                            if (Tmp.Length > 1)
+                            {
+                                upn.DomainName = Tmp[1];
+                            }
+                        }
+
+                    }
+                }
+
                 if (user.Locked)
                     chkLocked.Enabled = true;
                 else
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.designer.cs
index 2295ee44..4c064976 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx.designer.cs
@@ -139,6 +139,15 @@ namespace WebsitePanel.Portal.HostedSolution {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblUserPrincipalName;
         
+        /// <summary>
+        /// upn 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.EmailAddress upn;
+        
         /// <summary>
         /// locDisplayName control.
         /// </summary>