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>