diff --git a/optional/install-chrome.cmd b/optional/install-chrome.cmd
index 6324d51..11a89d6 100644
--- a/optional/install-chrome.cmd
+++ b/optional/install-chrome.cmd
@@ -31,8 +31,7 @@ call %SCRIPTS%\unpin-taskbar-icons.cmd
 echo.
 
 echo disabling update tasks ...
-schtasks /Change /TN "GoogleUpdateTaskMachineCore{FF03DE7D-B6BB-4BD9-B599-5500A9284F84}" /disable
-schtasks /Change /TN "GoogleUpdateTaskMachineUA{947CFA0A-AC3E-424D-99CD-38EE819AB072}" /disable
+powershell -Command "get-scheduledtask | where TaskName -like 'Google*' | Disable-ScheduledTask"
 
 echo renaming chrome desktop shortcut ...
 move /Y %PUBLIC%\Desktop\"Google Chrome.lnk" %PUBLIC%\Desktop\Chrome.lnk 2>nul
@@ -46,11 +45,6 @@ del /F /Q "%USERPROFILE%\Desktop\Google Chrome.lnk" 2>nul
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
-rem ###
-rem rd /S /Q %USERPROFILE%"\AppData\Local\Google\Chrome\User Data\Default\Cache"
-rem del /F /Q %USERPROFILE%"\AppData\Local\Google\Chrome\User Data\Default\History*"
-rem ###
-
 echo ####### %0 #######
 pause
 
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 3638dc8..22c5a66 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -454,6 +454,11 @@ for %%D in (
 rem delete strange "about" link in IrfanView Startmenu folder ...
 del /F /Q  "%STARTMENU_PUBLIC%\IrfanView\About IrfanView.lnk" 2>nul
 
+echo.
+echo Deleting chrome cache and history ...
+rd /S /Q %USERPROFILE%"\AppData\Local\Google\Chrome\User Data\Default\Cache" 2>nul
+del /F /Q %USERPROFILE%"\AppData\Local\Google\Chrome\User Data\Default\History*" 2>nul
+
 echo.
 echo Other tasks and fixes for the user
 echo ########################################