diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 0d63e0aa37..8a6a6820de 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -14,6 +14,14 @@
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" />
 
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
+
+    <Upgrade Id="42B84BF7-5FBF-473B-9C8B-049DC16F7708">
+      <UpgradeVersion
+         Minimum="0.11.0" Maximum="0.11.0"
+         Property="PREVIOUSVERSIONSINSTALLED"
+         IncludeMinimum="yes" IncludeMaximum="yes" />
+    </Upgrade>
+    
     <MediaTemplate EmbedCab="yes" />
 
     <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
@@ -60,9 +68,7 @@
         NOT Installed and CREATESCHEDULEDTASK = 1
       </Custom>
       <Custom Action="WixCloseApplications" Before="RemoveFiles" />
-      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles">
-        Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
+      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <Custom Action="TelemetryLogInstallSuccess" After="InstallFinalize">
         NOT Installed
       </Custom>
@@ -84,7 +90,6 @@
                   DllEntry="CreateScheduledTaskCA"
                    />
 
-    <!-- Needs to Impersonate="no" and Execute="deferred" in order to run elevated. -->
     <CustomAction Id="RemovePowerToysSchTasks"
                   Return="ignore"
                   Impersonate="no"
diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp
index 20639ab4c4..154d1cc29b 100644
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -29,7 +29,7 @@ const DWORD USERNAME_LEN = UNLEN + 1; // User Name + '\0'
 // Creates a Scheduled Task to run at logon for the current user.
 // The path of the executable to run should be passed as the CustomActionData (Value).
 // Based on the Task Scheduler Logon Trigger Example:
-// https://docs.microsoft.com/en-us/windows/desktop/taskschd/logon-trigger-example--c---/
+// https://docs.microsoft.com/en-us/windows/win32/taskschd/logon-trigger-example--c---/
 UINT __stdcall CreateScheduledTaskCA(MSIHANDLE hInstall) {
   HRESULT hr = S_OK;
   UINT er = ERROR_SUCCESS;