diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
index 49b591ab..4521e180 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/Constants.cs
@@ -66,6 +66,8 @@ namespace WebsitePanel.Providers.Common
 
         public const string UtilityPath = "UtilityPath";
 
+        public const string HandheldcleanupPath = "HandheldcleanupPath";
+
         public const string MAPIProfile = "MAPIProfile";
 
         public const string EnterpriseServer = "EnterpriseServer";
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/BlackBerry5_Settings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/BlackBerry5_Settings.ascx.resx
index c488c21d..53e4e1e2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/BlackBerry5_Settings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/BlackBerry5_Settings.ascx.resx
@@ -123,6 +123,12 @@
   <data name="lblEnterpriseServerFQDN.Text" xml:space="preserve">
     <value>BlackBerry Enterprise Server FQDN:</value>
   </data>
+  <data name="lblHandheldcleanupPath.Text" xml:space="preserve">
+    <value>handheldcleanup.exe utility Path:</value>
+  </data>
+  <data name="lblMAPIProfile.Text" xml:space="preserve">
+    <value>BlackBerry MAPI Profile:</value>
+  </data>
   <data name="lblPassword.Text" xml:space="preserve">
     <value>Authentication password:</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx
index 927b8e5e..52416d61 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx
@@ -6,6 +6,13 @@
             <asp:TextBox runat="server" ID="txtPath" MaxLength="256" Width="200px"  />            
             <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtPath" Display="Dynamic" ErrorMessage="*" />
         </td>
+    </tr>
+        <tr>
+        <td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblHandheldcleanupPath" meta:resourcekey="lblHandheldcleanupPath" /></td>
+        <td>                        
+            <asp:TextBox runat="server" ID="txtHandheldcleanupPath" MaxLength="256" Width="200px"  />            
+            <asp:RequiredFieldValidator ID="RequiredFieldValidator7" runat="server" ControlToValidate="txtHandheldcleanupPath" Display="Dynamic" ErrorMessage="*" />
+        </td>
     </tr>
     <tr>
         <td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblUser" meta:resourcekey="lblUser" /></td>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.cs
index ca40b4e0..b88abed0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.cs
@@ -42,6 +42,7 @@ namespace WebsitePanel.Portal.ProviderControls
         public void BindSettings(StringDictionary settings)
         {
             txtPath.Text = settings[Constants.UtilityPath];
+            txtHandheldcleanupPath.Text = settings[Constants.HandheldcleanupPath];
             txtPassword.Text = settings[Constants.Password];
             txtEnterpriseServer.Text = settings[Constants.EnterpriseServer];
             txtEnterpriseServerFQDN.Text = settings[Constants.EnterpriseServerFQDN];
@@ -53,6 +54,7 @@ namespace WebsitePanel.Portal.ProviderControls
         public void SaveSettings(StringDictionary settings)
         {
             settings[Constants.UtilityPath] = txtPath.Text;
+            settings[Constants.HandheldcleanupPath] = txtHandheldcleanupPath.Text;
             settings[Constants.EnterpriseServer] = txtEnterpriseServer.Text;
             settings[Constants.EnterpriseServerFQDN] = txtEnterpriseServerFQDN.Text;
             settings[Constants.Password] = (txtPassword.Text.Length > 0) ? txtPassword.Text : (string)ViewState["PWD"];
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.designer.cs
index 12c29236..fcdef004 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/BlackBerry5_Settings.ascx.designer.cs
@@ -39,6 +39,33 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
         
+        /// <summary>
+        /// lblHandheldcleanupPath 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.Label lblHandheldcleanupPath;
+        
+        /// <summary>
+        /// txtHandheldcleanupPath 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.TextBox txtHandheldcleanupPath;
+        
+        /// <summary>
+        /// RequiredFieldValidator7 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.RequiredFieldValidator RequiredFieldValidator7;
+        
         /// <summary>
         /// lblUser control.
         /// </summary>