diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 3dbe097a..8f46ab03 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -876,6 +876,9 @@
   <data name="Error.WPI_LOAD_FEED" xml:space="preserve">
     <value>Error loading feeds. Please check system settings</value>
   </data>
+  <data name="Error.WPI_CHECK_LOAD_USER_PROFILE" xml:space="preserve">
+    <value>Error checking 'Load user profile' application pool setting.</value>
+  </data>
   <data name="Error.SPACE_LETTER_GET" xml:space="preserve">
     <value>Error building hosting space summary letter</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx
index 456b474f..9d0fb002 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx
@@ -126,6 +126,16 @@ h2.ProductTitle {
 </script>
 
 
+<asp:Panel runat="server" ID="CheckLoadUserProfilePanel" Visible="False">
+    <div class="MessageBox Yellow">
+        To continue "Load User Profile" setting for the current application pool must be enabled. 
+        <br/>
+        Enable this setting now? (May require relogin)        
+        <br/>
+        <br/>
+        <asp:Button runat="server" ID="EnableLoadUserProfileButton" Text="Yes" OnClick="EnableLoadUserProfileButton_OnClick"/>
+    </div>
+</asp:Panel>
 
 
 <asp:Panel ID="SearchPanel" class="FormBody" runat="server">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.cs
index b11db9d3..7581e2f4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.cs
@@ -58,21 +58,24 @@ namespace WebsitePanel.Portal
                 {
                     if (!ES.Services.Servers.CheckLoadUserProfile(PanelRequest.ServerId))
                     {
-                        ShowWarningMessage("Server application pool \"Load User Profile\" setting is set to false. Please open IIS Manager, Application Pools, select pool running Web Site Panel Server component and set \"Load User Profile\" to TRUE. This setting is required for Web Paltform Installer to run.");
-
-                        //ES.Services.Servers.EnableLoadUserProfile(PanelRequest.ServerId);
+                        CheckLoadUserProfilePanel.Visible = true;
                     }
                 }
-                catch
+                catch (NotImplementedException ex)
                 {
+                    CheckLoadUserProfilePanel.Visible = false;
+                    ShowWarningMessage("Server application pool \"Load User Profile\" setting unavailable. Need IIS7 or higher. Fails is possible");
+                }
+                catch (Exception ex)
+                {
+                    CheckLoadUserProfilePanel.Visible = false;
                     ProductsPanel.Visible = false;
                     keywordsList.Visible = false;
                     SearchPanel.Visible = false;
                     InstallButtons1.Visible = false;
                     InstallButtons2.Visible = false;
 
-                    ShowWarningMessage("Server application pool \"Load User Profile\" setting is set to false. Please open IIS Manager, Application Pools, select pool running Web Site Panel Server component and set \"Load User Profile\" to TRUE. This setting is required for Web Paltform Installer to run.");
-
+                    ShowErrorMessage("WPI_CHECK_LOAD_USER_PROFILE", ex);
                 }
 
 
@@ -606,5 +609,11 @@ namespace WebsitePanel.Portal
                 WpiLogsPre.InnerText = msg;
             }
         }
+
+        protected void EnableLoadUserProfileButton_OnClick(object sender, EventArgs e)
+        {
+            ES.Services.Servers.EnableLoadUserProfile(PanelRequest.ServerId);
+            CheckLoadUserProfilePanel.Visible = false;
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.designer.cs
index 15aaca0c..c26a55b9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditWebPlatformInstaller.ascx.designer.cs
@@ -26,7 +26,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -59,6 +58,24 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.ServerHeaderControl ServerHeaderControl1;
         
+        /// <summary>
+        /// CheckLoadUserProfilePanel 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.Panel CheckLoadUserProfilePanel;
+        
+        /// <summary>
+        /// EnableLoadUserProfileButton 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.Button EnableLoadUserProfileButton;
+        
         /// <summary>
         /// SearchPanel control.
         /// </summary>