Update old Office version detection with subscription license

MAS/All-In-One-Version-KL/MAS_AIO.cmd

@@ -2471,12 +2471,12 @@ call :oh_hookinstall
 
 ::========================================================================================================================================
 
-::  Old version (16.0.9xxxx and below) of Office with subscription license key may show a banner to sign in to fix license issue.
+::  Old version of Office with subscription license key may show a banner to sign in to fix license issue.
 ::  Although script applies a Resiliency registry entry to fix that but it doesn't work on old office versions.
 ::  Below code checks that condition and informs the user to update the Office.
 
 if defined _sublic (
-if not exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+if not exist "%_oLPath%\Word2021VL_KMS_Client_AE*.xrm-ms" (
 call :dk_color %Gray% "Checking Old Office With Sub License    [Found. Update Office, otherwise, it may show a licensing issue-related banner.]"
 )
 )
@@ -17943,6 +17943,7 @@ echo:
 set suggestchannel=
 
 if %errorcode% EQU 0 (
+if %change%==1 (
 echo %targetedition% | find /i "2019Volume" %nul% && (
 if not defined ltsc19 set suggestchannel=Production::LTSC
 if /i not %_AudienceData%==Production::LTSC set suggestchannel=Production::LTSC
@@ -17970,8 +17971,8 @@ if defined suggestchannel (
 call :dk_color %Gray% "Mismatch found in update channel and installed product."
 call :dk_color %Blue% "It is recommended to change the update channel to [!suggestchannel!] from the previous menu."
 )
-
 echo:
+)
 call :dk_color %Gray% "To activate Office, run the activation option from the main menu."
 ) else (
 set fixes=%fixes% %mas%troubleshoot

MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -671,12 +671,12 @@ call :oh_hookinstall
 
 ::========================================================================================================================================
 
-::  Old version (16.0.9xxxx and below) of Office with subscription license key may show a banner to sign in to fix license issue.
+::  Old version of Office with subscription license key may show a banner to sign in to fix license issue.
 ::  Although script applies a Resiliency registry entry to fix that but it doesn't work on old office versions.
 ::  Below code checks that condition and informs the user to update the Office.
 
 if defined _sublic (
-if not exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+if not exist "%_oLPath%\Word2021VL_KMS_Client_AE*.xrm-ms" (
 call :dk_color %Gray% "Checking Old Office With Sub License    [Found. Update Office, otherwise, it may show a licensing issue-related banner.]"
 )
 )

MAS/Separate-Files-Version/Change_Office_Edition.cmd

@@ -806,6 +806,7 @@ echo:
 set suggestchannel=
 
 if %errorcode% EQU 0 (
+if %change%==1 (
 echo %targetedition% | find /i "2019Volume" %nul% && (
 if not defined ltsc19 set suggestchannel=Production::LTSC
 if /i not %_AudienceData%==Production::LTSC set suggestchannel=Production::LTSC
@@ -833,8 +834,8 @@ if defined suggestchannel (
 call :dk_color %Gray% "Mismatch found in update channel and installed product."
 call :dk_color %Blue% "It is recommended to change the update channel to [!suggestchannel!] from the previous menu."
 )
-
 echo:
+)
 call :dk_color %Gray% "To activate Office, run the activation option from the main menu."
 ) else (
 set fixes=%fixes% %mas%troubleshoot