diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.hMail5/hMailServer5.vb b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.hMail5/hMailServer5.vb
index f4a71cae..4f013d34 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.hMail5/hMailServer5.vb
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.hMail5/hMailServer5.vb
@@ -377,7 +377,7 @@ Public Class hMailServer5
             objAccount.Password = mailbox.Password
             objAccount.MaxSize = mailbox.MaxMailboxSize
             objAccount.PersonFirstName = mailbox.FirstName
-            objAccount.PersonLastName = mailbox.FirstName
+            objAccount.PersonLastName = mailbox.LastName
             objAccount.SignatureEnabled = mailbox.SignatureEnabled
             objAccount.SignaturePlainText = mailbox.Signature
             objAccount.SignatureHTML = mailbox.SignatureHTML
@@ -397,9 +397,12 @@ Public Class hMailServer5
 
             'set forwarding address
             If mailbox.ForwardingEnabled Then
-                objAccount.ForwardAddress = mailbox.ForwardingAddresses(0)
-                objAccount.ForwardEnabled = True
-                objAccount.ForwardKeepOriginal = mailbox.RetainLocalCopy
+                If Not String.IsNullOrEmpty(mailbox.ForwardingAddresses(0)) Then
+                    'Log.WriteInfo("forwarding enabled on creation of email account")
+                    objAccount.ForwardAddress = mailbox.ForwardingAddresses(0)
+                    objAccount.ForwardEnabled = True
+                    objAccount.ForwardKeepOriginal = mailbox.RetainLocalCopy
+                End If
             End If
 
             objAccount.Save()
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png
index 003b659c..8db3bf62 100644
Binary files a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png and b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs
index a4380cb9..2854f39c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs
@@ -136,7 +136,7 @@ namespace WebsitePanel.Portal.HostedSolution
 
                 var accountType = (ExchangeAccountType)gvUsers.DataKeys[rowIndex][1];
 
-                if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATION_DELETED_USERS) && accountType != ExchangeAccountType.User)
+                if (Utils.CheckQouta(Quotas.ORGANIZATION_DELETED_USERS, cntx) && accountType != ExchangeAccountType.User)
                 {
                     chkEnableForceArchiveMailbox.Visible = true;
 
@@ -362,7 +362,7 @@ namespace WebsitePanel.Portal.HostedSolution
             {
                 int result = 0;
 
-                if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATION_DELETED_USERS))
+                if (Utils.CheckQouta(Quotas.ORGANIZATION_DELETED_USERS, cntx))
                 {
                     result = ES.Services.Organizations.SetDeletedUser(PanelRequest.ItemID, int.Parse(hdAccountId.Value), chkEnableForceArchiveMailbox.Checked);
                 }