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/EnterpriseStorageCreateDriveMap.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx
index 782c6530..17129e7f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx
@@ -30,7 +30,8 @@
 							<td class="FormLabel150"><asp:Localize ID="locFolder" runat="server" meta:resourcekey="locFolder" Text="Storage Folder:"></asp:Localize></td>
 							<td> 
                                 <div class="Folders" style="display:inline;">
-                                    <asp:DropDownList ID="ddlFolders" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" />                    
+                                    <asp:DropDownList ID="ddlFolders" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" />  
+                                    <asp:HiddenField id="txtFolderName" runat="server"/>                  
                                 </div>
                                 <div class="Url" style="display:inline;">
                                     <asp:Literal ID="lbFolderUrl" runat="server"></asp:Literal>
@@ -42,6 +43,7 @@
 						    <td>
                                 <div class="LabelAs">
 							        <asp:TextBox ID="txtLabelAs" runat="server" CssClass="NormalTextBox" Width="145px"></asp:TextBox>
+                                    
                                 </div>
 						    </td>
 					    </tr>
@@ -69,6 +71,7 @@
         $('.Folders select').bind('change', function () {
             $('.LabelAs input').val($('.Folders select option:selected').text());
             $('.Url').text($('.Folders select option:selected').val());
+            $('.Folders input').val($('.Folders select option:selected').text());
         });
     });
 </script>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs
index 8a9b9b5e..250137a7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs
@@ -63,6 +63,7 @@ namespace WebsitePanel.Portal.ExchangeServer
             {
                 txtLabelAs.Text = ddlFolders.SelectedItem.Text;
                 lbFolderUrl.Text = ddlFolders.SelectedItem.Value;
+                txtFolderName.Value = ddlFolders.SelectedItem.Text;
             }
         }
 
@@ -102,7 +103,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                     PanelRequest.ItemID,
                     ddlLetters.SelectedItem.Value,
                     txtLabelAs.Text,
-                    ddlFolders.SelectedItem.Text);
+                    txtFolderName.Value);
 
                 if (!result.IsSuccess && result.ErrorCodes.Count > 0)
                 {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs
index e1b30731..9ce14f62 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs
@@ -84,6 +84,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlFolders;
         
+        /// <summary>
+        /// txtFolderName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField txtFolderName;
+        
         /// <summary>
         /// lbFolderUrl control.
         /// </summary>
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)