diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
index b75993f8..668888ea 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
@@ -7317,6 +7317,7 @@ namespace WebsitePanel.Providers.HostedSolution
                     cmd.Parameters.Add("Identity", accountName);
                     cmd.Parameters.Add("Archive");
                     string database = GetDatabase(runSpace, PrimaryDomainController, ArchiveMailboxDatabase);
+                    if (String.IsNullOrEmpty(database)) database = ArchiveMailboxDatabase;
                     ExchangeLog.DebugInfo("archivedatabase: " + database);
                     if (database != string.Empty)
                     {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
index d3764b2f..40324a81 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
@@ -49,7 +49,7 @@
 					                <tr>
 					                    <td class="FormLabel150"><asp:Localize ID="Localize2" runat="server" meta:resourcekey="locMailboxplanName" Text="Mailbox plan: *"></asp:Localize></td>
 					                    <td>                                
-                                            <wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" Changed="mailboxPlanSelector_Changed" />
+                                            <wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" OnChanged="mailboxPlanSelector_Changed" />
                                         </td>
 					                </tr>
 					                <tr>
@@ -108,7 +108,7 @@
 						            <tr>
 						                <td class="FormLabel150"></td>
 						                <td>
-						                    <asp:CheckBox ID="chkEnableArchiving" runat="server" meta:resourcekey="chkEnableArchiving" Text="Enable archiving" AutoPostBack="true" />
+						                    <asp:CheckBox ID="chkEnableArchiving" runat="server" meta:resourcekey="chkEnableArchiving" Text="Enable archiving" />
 						                    <br />
 						                </td>
 						            </tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
index c59e5e69..b1c6aa4c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
@@ -82,7 +82,6 @@ namespace WebsitePanel.Portal.ExchangeServer
                 }
 
                 secRetentionPolicy.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx);
-
             }
 
             int planId = -1;
@@ -90,8 +89,6 @@ namespace WebsitePanel.Portal.ExchangeServer
             ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, planId);
 
             secArchiving.Visible = plan.EnableArchiving;
-
-            rowArchiving.Visible = chkEnableArchiving.Checked;
         }
 
         private void BindSettings()
@@ -165,6 +162,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                 chkEnableArchiving.Checked = account.EnableArchiving;
                 archivingQuotaViewer.QuotaUsedValue = Convert.ToInt32(stats.ArchivingTotalSize / 1024 / 1024);
                 archivingQuotaViewer.QuotaValue = ArchivingMaxSize;
+                rowArchiving.Visible = chkEnableArchiving.Checked;
 
             }
             catch (Exception ex)