From bd2089f062235c4056924b2d10591a0e6dcdc16f Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:20:37 -0400
Subject: [PATCH 01/16] Minor Fixes

Minor Fixes
---
 MerlinAU.sh | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index c678bfd0..eb802c60 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -4,12 +4,12 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Apr-08
+# Last Modified: 2025-Apr-09
 ###################################################################
 set -u
 
 ## Set version for each Production Release ##
-readonly SCRIPT_VERSION=1.4.1
+readonly SCRIPT_VERSION=1.4.2
 readonly SCRIPT_NAME="MerlinAU"
 ## Set to "master" for Production Releases ##
 SCRIPT_BRANCH="dev"
@@ -47,13 +47,6 @@ ScriptBuildNum=0
 ScriptVersionNum=""
 scriptUpdateNotify=0
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2024-Oct-02] ##
-##------------------------------------------##
-# For minimum supported firmware version check #
-MinFirmwareVerCheckFailed=false
-MinSupportedFirmwareVers="3004.386.12.6"
-
 # For router model check #
 routerModelCheckFailed=false
 offlineUpdateTrigger=false
@@ -196,12 +189,15 @@ readonly fwInstalledExtendNum="$(nvram get extendno)"
 readonly fwInstalledInnerVers="$(nvram get innerver)"
 readonly fwInstalledBranchVer="${fwInstalledBaseVers}.$(echo "$fwInstalledBuildVers" | awk -F'.' '{print $1}')"
 
-##-------------------------------------##
-## Added by Martinski W. [2024-Oct-03] ##
-##-------------------------------------##
-readonly MinSupportedFW_3004_386_Ver="3004.386.12.6"
-readonly MinSupportedFW_3004_388_Ver="3004.388.6.2"
-readonly MinSupportedFW_3006_102_Ver="3004.388.8.0"
+
+##------------------------------------------##
+## Modified by ExtremeFiretop [2024-Oct-02] ##
+##------------------------------------------##
+# For minimum supported firmware version check #
+MinFirmwareVerCheckFailed=false
+readonly MinSupportedFW_3004_386_Ver="3004.386.13.2"
+readonly MinSupportedFW_3004_388_Ver="3004.388.8.0"
+readonly MinSupportedFW_3006_102_Ver="3004.388.8.2"
 
 case "$fwInstalledBranchVer" in
    "3004.386") MinSupportedFirmwareVers="$MinSupportedFW_3004_386_Ver" ;;
@@ -1137,9 +1133,9 @@ _UpdateLoginPswdCheckHelper_()
    _WriteVarDefToPswdCheckJSFile_ "loginPswdCheckMsgStr" "$checkMsge"
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2025-Apr-07] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-09] ##
+##------------------------------------------##
 _InitCustomDefaultsConfig_()
 {
    [ ! -d "$SETTINGS_DIR" ] && mkdir -m 755 -p "$SETTINGS_DIR"
@@ -1158,6 +1154,7 @@ _InitCustomDefaultsConfig_()
          echo "FW_New_Update_LOG_Preferred_Path=\"${FW_Update_LOG_BASE_DefaultDIR}\""
          echo "FW_New_Update_EMail_CC_Name=TBD"
          echo "FW_New_Update_EMail_CC_Address=TBD"
+         echo "FW_New_Update_Changelog_Approval=TBD"
          echo "credentials_base64 TBD"
          echo "CheckChangeLog ENABLED"
          echo "FW_Update_Check TBD"
@@ -2852,7 +2849,7 @@ _SCRIPT_UPDATE_()
 
    if [ "$SCRIPT_VERSION" = "$DLRepoVersion" ] && { [ -z "$DLRepoBuildNum" ] || [ "$DLRepoBuildNum" = "$ScriptBuildNum" ]; }
    then
-      echo -e "${CYANct}You are on the latest version! Would you like to download anyways?${NOct}"
+      echo -e "${CYANct}You are on the latest version! Would you like to download anyway?${NOct}"
       echo -e "${CYANct}This will overwrite your currently installed version.${NOct}"
       if _WaitForYESorNO_
       then
@@ -4415,6 +4412,8 @@ _GetLoginCredentials_()
         if _WaitForYESorNO_ "\nWould you like to test the current login credentials?"
         then
             _TestLoginCredentials_ "$loginCredsENC" || continue
+		else
+			_UpdateLoginPswdCheckHelper_ UNKNOWN
         fi
 
         # Stop the loop if the test passes or if the user chooses not to test #
@@ -7195,7 +7194,7 @@ _high_risk_phrases_interactive_()
             if [ "$inMenuMode" = true ]
             then
                 printf "\n ${REDct}*WARNING*: Found high-risk phrases in the changelog file.${NOct}"
-                printf "\n ${REDct}Would you like to continue with the firmware update anyways?${NOct}"
+                printf "\n ${REDct}Would you like to continue with the firmware update anyway?${NOct}"
                 if ! _WaitForYESorNO_
                 then
                     Say "Exiting for changelog review."
@@ -10261,8 +10260,10 @@ _ShowMainMenuOptions_()
    fi
    printf "\n${SEPstr}"
 
+   loginStatusMsg=$(grep "^var loginPswdCheckMsgStr =" "$PSWD_CHECK_JS" | awk -F"'" '{print $2}')
    printf "\n  ${GRNct}1${NOct}.  Run F/W Update Check Now\n"
-   printf "\n  ${GRNct}2${NOct}.  Set Router Login Password\n"
+   printf "\n  ${GRNct}2${NOct}.  Set Router Login Password"
+   printf "\n${padStr}[Currently ${InvBMGNct}$loginStatusMsg${NOct}]\n"
 
    # Enable/Disable the ASUS Router's built-in "F/W Update Check" #
    FW_UpdateCheckState="$(nvram get firmware_check_enable)"

From b0177139f8b1823e1fab53a59902dc0c4b039802 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:22:59 -0400
Subject: [PATCH 02/16] Update MerlinAU.sh

---
 MerlinAU.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index eb802c60..93c76705 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -191,7 +191,7 @@ readonly fwInstalledBranchVer="${fwInstalledBaseVers}.$(echo "$fwInstalledBuildV
 
 
 ##------------------------------------------##
-## Modified by ExtremeFiretop [2024-Oct-02] ##
+## Modified by ExtremeFiretop [2025-Apr-09] ##
 ##------------------------------------------##
 # For minimum supported firmware version check #
 MinFirmwareVerCheckFailed=false
@@ -4347,9 +4347,9 @@ with the \"${GRNct}Web UI${NOct}\" access type on the \"Access restriction list\
    return 1
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2025-Mar-07] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-09] ##
+##------------------------------------------##
 _GetLoginCredentials_()
 {
     local retry="yes"  userName  savedMsgStr
@@ -4412,8 +4412,8 @@ _GetLoginCredentials_()
         if _WaitForYESorNO_ "\nWould you like to test the current login credentials?"
         then
             _TestLoginCredentials_ "$loginCredsENC" || continue
-		else
-			_UpdateLoginPswdCheckHelper_ UNKNOWN
+        else
+            _UpdateLoginPswdCheckHelper_ UNKNOWN
         fi
 
         # Stop the loop if the test passes or if the user chooses not to test #
@@ -10176,9 +10176,9 @@ _InvalidMenuSelection_()
    _WaitForEnterKey_
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2025-Feb-15] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-09] ##
+##------------------------------------------##
 _ShowMainMenuOptions_()
 {
    local FW_NewUpdateVerStr  FW_NewUpdateVersion

From 42bb8b1339e807be074e15f3320a1076290c843f Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:23:19 -0400
Subject: [PATCH 03/16] Update MerlinAU.asp

---
 MerlinAU.asp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 3e21edf1..d5981052 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -2684,7 +2684,7 @@ function initializeCollapsibleSections()
  <td>
     <div style="display: inline-block;">
       <input type="password" id="routerPassword" name="routerPassword" placeholder="Enter password"
-             style="width: 278px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
+             style="width: 275px; display: inline-block; margin-left:2px; margin-top:3px;" maxlength="64"
              onKeyPress="return validator.isString(this, event)"
              onblur="ValidatePasswordString(this,'onBLUR')"
              onkeyup="ValidatePasswordString(this,'onKEYUP')"/>
@@ -2881,7 +2881,7 @@ function initializeCollapsibleSections()
       </label>
    </td>
    <td>
-      <select id="rogFWBuildType" name="rogFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
+      <select id="rogFWBuildType" name="rogFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
          <option value="ROG">ROG</option>
          <option value="Pure">Pure</option>
       </select>
@@ -2899,7 +2899,7 @@ function initializeCollapsibleSections()
       </label>
    </td>
    <td>
-      <select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 20%;" onchange="handleTUFROGChange(this)">
+      <select id="tuffFWBuildType" name="tuffFWBuildType" style="width: 21%;" onchange="handleTUFROGChange(this)">
          <option value="TUF">TUF</option>
          <option value="Pure">Pure</option>
       </select>

From 412f7357444ebd297668fe18db717045b15f9281 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:34:45 -0400
Subject: [PATCH 04/16] Update version.txt

---
 version.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.txt b/version.txt
index 9e0593f5..d6bd7f64 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-1.4.1
-25040806
+1.4.2
+25040902

From 66a45daa0e453124a63c37ef56e471db23f744b2 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:35:09 -0400
Subject: [PATCH 05/16] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 604c89fb..9d244eca 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
-## v1.4.1
-## 2025-Apr-08
+## v1.4.2
+## 2025-Apr-09
 
 ## WebUI:
 ![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)

From 37a57bc63f29e5b38f5ae27b39db14ff25eb69bc Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 02:39:44 -0400
Subject: [PATCH 06/16] Update MerlinAU.asp

---
 MerlinAU.asp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index d5981052..06129fcf 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -2784,7 +2784,7 @@ function initializeCollapsibleSections()
     <div id="fwCronScheduleHOUR">
       <span style="margin-left:1px; margin-top:10px; font-size: 12px; font-weight: bolder;">Hour:</span>
       <input type="text" autocomplete="off" autocapitalize="off" data-lpignore="true"
-             style="width: 7%; margin-left: 20px; margin-top:10px; margin-bottom:7px" maxlength="2"
+             style="width: 7%; margin-left: 19px; margin-top:10px; margin-bottom:7px" maxlength="2"
              id="fwScheduleHOUR" name="fwScheduleHOUR" value="0"
              onKeyPress="return validator.isNumber(this,event)"
              onkeyup="ValidateFWUpdateTime(this,'HOUR')"

From ccdfd31ec7f120028d7f944d1d41b9af4270243b Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Wed, 9 Apr 2025 22:42:35 -0400
Subject: [PATCH 07/16] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9d244eca..ff8ce15c 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
  - GT-AX11000_PRO (Tested)
  - GT-AX11000 (Tested)
  - GT-AC2900 **(Untested)**
+ - RT-BE92U **(Untested)**
  - RT-BE96U **(Untested)**
  - RT-BE88U **(Untested)**
  - RT-BE86U **(Untested)**

From b515766af11d59e8964b7b14b353c0ae90102974 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 9 Apr 2025 22:11:26 -0700
Subject: [PATCH 08/16] Code Improvements

Some additional code improvements.
---
 MerlinAU.asp |   2 +-
 MerlinAU.sh  | 106 +++++++++++++++++++++++++++++++++------------------
 version.txt  |   2 +-
 3 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 06129fcf..8c2b38d2 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Apr-02 **/
+/** Last Modified: 2025-Apr-09 **/
 /** Intended for 1.4.x Release **/
 /**----------------------------**/
 
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 93c76705..5b1d9498 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -189,7 +189,6 @@ readonly fwInstalledExtendNum="$(nvram get extendno)"
 readonly fwInstalledInnerVers="$(nvram get innerver)"
 readonly fwInstalledBranchVer="${fwInstalledBaseVers}.$(echo "$fwInstalledBuildVers" | awk -F'.' '{print $1}')"
 
-
 ##------------------------------------------##
 ## Modified by ExtremeFiretop [2025-Apr-09] ##
 ##------------------------------------------##
@@ -199,10 +198,14 @@ readonly MinSupportedFW_3004_386_Ver="3004.386.13.2"
 readonly MinSupportedFW_3004_388_Ver="3004.388.8.0"
 readonly MinSupportedFW_3006_102_Ver="3004.388.8.2"
 
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-09] ##
+##----------------------------------------##
 case "$fwInstalledBranchVer" in
    "3004.386") MinSupportedFirmwareVers="$MinSupportedFW_3004_386_Ver" ;;
    "3004.388") MinSupportedFirmwareVers="$MinSupportedFW_3004_388_Ver" ;;
    "3006.102") MinSupportedFirmwareVers="$MinSupportedFW_3006_102_Ver" ;;
+            *) MinSupportedFirmwareVers="$MinSupportedFW_3004_386_Ver"
 esac
 
 ##----------------------------------------##
@@ -1064,7 +1067,7 @@ _WriteVarDefToPswdCheckJSFile_()
 ##-------------------------------------##
 ## Added by Martinski W. [2025-Mar-07] ##
 ##-------------------------------------##
-_GetLoginPswdCheckStatusJS_()
+_GetLoginPswdCheckStatusCodeJS_()
 {
    if [ ! -s "$PSWD_CHECK_JS" ] ; then echo "0" ; return 0 ; fi
    local checkCode
@@ -1076,6 +1079,21 @@ _GetLoginPswdCheckStatusJS_()
    return 0
 }
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Apr-09] ##
+##-------------------------------------##
+_GetLoginPswdCheckStatusMsgeJS_()
+{
+   if [ ! -s "$PSWD_CHECK_JS" ] ; then echo "UNKNOWN" ; return 0 ; fi
+   local checkMsge
+   checkMsge="$(grep "^var loginPswdCheckMsgStr =" "$PSWD_CHECK_JS" | awk -F "[=']" '{print $3}')"
+   if [ -z "$checkMsge" ]
+   then echo "UNKNOWN"
+   else echo "$checkMsge"
+   fi
+   return 0
+}
+
 ##-------------------------------------##
 ## Added by Martinski W. [2025-Mar-07] ##
 ##-------------------------------------##
@@ -1094,7 +1112,7 @@ _UpdateLoginPswdCheckHelper_()
            checkMsge="Login access is RESTRICTED."
            ;;
        OldPSWD)
-           prevChkCode="$(_GetLoginPswdCheckStatusJS_)"
+           prevChkCode="$(_GetLoginPswdCheckStatusCodeJS_)"
            if [ -n "$prevChkCode" ] && [ "$prevChkCode" -gt 1 ]
            then
                return 0
@@ -1116,7 +1134,7 @@ _UpdateLoginPswdCheckHelper_()
            checkMsge="Password is INVALID."
            ;;
        UNKNOWN)
-           prevChkCode="$(_GetLoginPswdCheckStatusJS_)"
+           prevChkCode="$(_GetLoginPswdCheckStatusCodeJS_)"
            if [ -n "$prevChkCode" ] && [ "$prevChkCode" -gt 1 ]
            then
                return 0
@@ -1133,9 +1151,9 @@ _UpdateLoginPswdCheckHelper_()
    _WriteVarDefToPswdCheckJSFile_ "loginPswdCheckMsgStr" "$checkMsge"
 }
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2025-Apr-09] ##
-##------------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-09] ##
+##----------------------------------------##
 _InitCustomDefaultsConfig_()
 {
    [ ! -d "$SETTINGS_DIR" ] && mkdir -m 755 -p "$SETTINGS_DIR"
@@ -1261,11 +1279,19 @@ _InitCustomDefaultsConfig_()
        fi
        retCode=1
    fi
-   if ! grep -q "^credentials_base64 " "$CONFIG_FILE"
+   if ! grep -q "^FW_New_Update_Changelog_Approval=" "$CONFIG_FILE"
    then
        if [ "$(wc -l < "$CONFIG_FILE")" -lt 12 ]
+       then echo "FW_New_Update_Changelog_Approval=TBD" >> "$CONFIG_FILE"
+       else sed -i "12 i FW_New_Update_Changelog_Approval=TBD" "$CONFIG_FILE"
+       fi
+       retCode=1
+   fi
+   if ! grep -q "^credentials_base64 " "$CONFIG_FILE"
+   then
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 13 ]
        then echo "credentials_base64 TBD" >> "$CONFIG_FILE"
-       else sed -i "12 i credentials_base64 TBD" "$CONFIG_FILE"
+       else sed -i "13 i credentials_base64 TBD" "$CONFIG_FILE"
        fi
        _UpdateLoginPswdCheckHelper_ InitPWD
        retCode=1
@@ -1274,49 +1300,49 @@ _InitCustomDefaultsConfig_()
    fi
    if ! grep -q "^CheckChangeLog " "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 13 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 14 ]
        then echo "CheckChangeLog ENABLED" >> "$CONFIG_FILE"
-       else sed -i "13 i CheckChangeLog ENABLED" "$CONFIG_FILE"
+       else sed -i "14 i CheckChangeLog ENABLED" "$CONFIG_FILE"
        fi
        retCode=1
    fi
    if ! grep -q "^FW_Update_Check " "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 14 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 15 ]
        then echo "FW_Update_Check TBD" >> "$CONFIG_FILE"
-       else sed -i "14 i FW_Update_Check TBD" "$CONFIG_FILE"
+       else sed -i "15 i FW_Update_Check TBD" "$CONFIG_FILE"
        fi
        retCode=1
    fi
    if ! grep -q "^Allow_Updates_OverVPN " "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 15 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 16 ]
        then echo "Allow_Updates_OverVPN DISABLED" >> "$CONFIG_FILE"
-       else sed -i "15 i Allow_Updates_OverVPN DISABLED" "$CONFIG_FILE"
+       else sed -i "16 i Allow_Updates_OverVPN DISABLED" "$CONFIG_FILE"
        fi
        retCode=1
    fi
    if ! grep -q "^FW_Allow_Beta_Production_Up " "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 16 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 17 ]
        then echo "FW_Allow_Beta_Production_Up ENABLED" >> "$CONFIG_FILE"
-       else sed -i "16 i FW_Allow_Beta_Production_Up ENABLED" "$CONFIG_FILE"
+       else sed -i "17 i FW_Allow_Beta_Production_Up ENABLED" "$CONFIG_FILE"
        fi
        retCode=1
    fi
    if ! grep -q "^Allow_Script_Auto_Update " "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 17 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 18 ]
        then echo "Allow_Script_Auto_Update DISABLED" >> "$CONFIG_FILE"
-       else sed -i "17 i Allow_Script_Auto_Update DISABLED" "$CONFIG_FILE"
+       else sed -i "18 i Allow_Script_Auto_Update DISABLED" "$CONFIG_FILE"
        fi
        retCode=1
    fi
    if ! grep -q "^Script_Update_Cron_Job_SchedDays=" "$CONFIG_FILE"
    then
-       if [ "$(wc -l < "$CONFIG_FILE")" -lt 18 ]
+       if [ "$(wc -l < "$CONFIG_FILE")" -lt 19 ]
        then echo "Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\"" >> "$CONFIG_FILE"
-       else sed -i "18 i Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\"" "$CONFIG_FILE"
+       else sed -i "19 i Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\"" "$CONFIG_FILE"
        fi
        retCode=1
    fi
@@ -2847,7 +2873,8 @@ _SCRIPT_UPDATE_()
    if "$mountWebGUI_OK"
    then _SetVersionSharedSettings_ server "$DLRepoVersion" ; fi
 
-   if [ "$SCRIPT_VERSION" = "$DLRepoVersion" ] && { [ -z "$DLRepoBuildNum" ] || [ "$DLRepoBuildNum" = "$ScriptBuildNum" ]; }
+   if [ "$SCRIPT_VERSION" = "$DLRepoVersion" ] && \
+      { [ -z "$DLRepoBuildNum" ] || [ "$DLRepoBuildNum" = "$ScriptBuildNum" ]; }
    then
       echo -e "${CYANct}You are on the latest version! Would you like to download anyway?${NOct}"
       echo -e "${CYANct}This will overwrite your currently installed version.${NOct}"
@@ -2861,8 +2888,8 @@ _SCRIPT_UPDATE_()
               then _SetVersionSharedSettings_ local "$DLRepoVersion"
               fi
               printf "\n${CYANct}Download successful!${NOct}\n"
-              printf "$(date) - Successfully downloaded $SCRIPT_NAME v${DLRepoVersion}\n"
-              printf "${CYANct}Update successful! Restarting script...${NOct}\n"
+              printf "$(date) - Successfully updated $SCRIPT_NAME v${DLRepoVersion}\n"
+              printf "${CYANct}Restarting script...${NOct}\n"
               sleep 1
               _CheckForNewGUIVersionUpdate_ && extraParam="install"
               _ReleaseLock_
@@ -2890,8 +2917,8 @@ _SCRIPT_UPDATE_()
               then _SetVersionSharedSettings_ local "$DLRepoVersion"
               fi
               printf "\n${CYANct}Download successful!${NOct}\n"
-              printf "\n$(date) - Successfully downloaded $SCRIPT_NAME v${DLRepoVersion}\n"
-              printf "${CYANct}Update successful! Restarting script...${NOct}\n"
+              printf "\n$(date) - Successfully updated $SCRIPT_NAME v${DLRepoVersion}\n"
+              printf "${CYANct}Restarting script...${NOct}\n"
               sleep 1
               _CheckForNewGUIVersionUpdate_ && extraParam="install"
               _ReleaseLock_
@@ -4347,9 +4374,9 @@ with the \"${GRNct}Web UI${NOct}\" access type on the \"Access restriction list\
    return 1
 }
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2025-Apr-09] ##
-##------------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-09] ##
+##----------------------------------------##
 _GetLoginCredentials_()
 {
     local retry="yes"  userName  savedMsgStr
@@ -4408,15 +4435,12 @@ _GetLoginCredentials_()
         printf "Encoded Credentials:\n"
         printf "${GRNct}$loginCredsENC${NOct}\n"
 
-        # Prompt to test the credentials #
         if _WaitForYESorNO_ "\nWould you like to test the current login credentials?"
         then
             _TestLoginCredentials_ "$loginCredsENC" || continue
-        else
-            _UpdateLoginPswdCheckHelper_ UNKNOWN
         fi
 
-        # Stop the loop if the test passes or if the user chooses not to test #
+        # Stop the loop if test passes or if user chooses not to test #
         retry="no"
     done
 
@@ -10176,12 +10200,13 @@ _InvalidMenuSelection_()
    _WaitForEnterKey_
 }
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2025-Apr-09] ##
-##------------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-09] ##
+##----------------------------------------##
 _ShowMainMenuOptions_()
 {
    local FW_NewUpdateVerStr  FW_NewUpdateVersion
+   local loginPswdStatusMsg  pswdChckCTag
 
    #-----------------------------------------------------------#
    # Check if router reports a new F/W update is available.
@@ -10260,10 +10285,15 @@ _ShowMainMenuOptions_()
    fi
    printf "\n${SEPstr}"
 
-   loginStatusMsg=$(grep "^var loginPswdCheckMsgStr =" "$PSWD_CHECK_JS" | awk -F"'" '{print $2}')
    printf "\n  ${GRNct}1${NOct}.  Run F/W Update Check Now\n"
+
+   loginPswdStatusMsg="$(_GetLoginPswdCheckStatusMsgeJS_)"
+   if [ "$(_GetLoginPswdCheckStatusCodeJS_)" -eq 4 ]
+   then pswdChckCTag="$InvBGRNct"  ##SUCCESS##
+   else pswdChckCTag="$InvBMGNct"
+   fi
    printf "\n  ${GRNct}2${NOct}.  Set Router Login Password"
-   printf "\n${padStr}[Currently ${InvBMGNct}$loginStatusMsg${NOct}]\n"
+   printf "\n${padStr}[Currently ${pswdChckCTag}$loginPswdStatusMsg${NOct}]\n"
 
    # Enable/Disable the ASUS Router's built-in "F/W Update Check" #
    FW_UpdateCheckState="$(nvram get firmware_check_enable)"
diff --git a/version.txt b/version.txt
index d6bd7f64..2b912d35 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 1.4.2
-25040902
+25040922

From 46d4f90dd64416749ee31cf30f4943a8f6c97be5 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Fri, 11 Apr 2025 01:27:45 -0400
Subject: [PATCH 09/16] Patch Changelog and Email Notifications

Patch Changelog and Email Notifications
---
 MerlinAU.sh | 73 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index 5b1d9498..ccbc4781 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -4,7 +4,7 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Apr-09
+# Last Modified: 2025-Apr-11
 ###################################################################
 set -u
 
@@ -7196,9 +7196,9 @@ _Toggle_ScriptAutoUpdate_Config_()
     return "$retCode"
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2024-May-31] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-11] ##
+##------------------------------------------##
 _high_risk_phrases_interactive_()
 {
     local changelog_contents="$1"
@@ -7232,9 +7232,8 @@ _high_risk_phrases_interactive_()
                 Say "*WARNING*: Found high-risk phrases in the changelog file."
                 Say "Please run script interactively to approve the firmware update."
                 Update_Custom_Settings "FW_New_Update_Changelog_Approval" "BLOCKED"
-                _SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
                 _DoCleanUp_ 1
-                _DoExit_ 1
+                return 1
             fi
         fi
     else
@@ -7384,9 +7383,9 @@ _ChangelogVerificationCheck_()
     fi
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2024-Nov-18] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-11] ##
+##------------------------------------------##
 _ManageChangelogMerlin_()
 {
     if [ $# -eq 0 ] || [ -z "$1" ]
@@ -7447,7 +7446,16 @@ _ManageChangelogMerlin_()
     else
         if [ "$mode" = "download" ]
         then
-            _ChangelogVerificationCheck_ "auto"
+           if ! "$FlashStarted"
+           then
+               _ChangelogVerificationCheck_ "auto"
+           else
+               if ! _ChangelogVerificationCheck_ "interactive"
+               then
+                   _SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
+                   return 1
+               fi
+           fi
         elif [ "$mode" = "view" ]
         then
             clear
@@ -7465,9 +7473,9 @@ _ManageChangelogMerlin_()
     return 0
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2024-Nov-18] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-11] ##
+##------------------------------------------##
 _ManageChangelogGnuton_()
 {
     if [ $# -eq 0 ] || [ -z "$1" ]
@@ -7508,7 +7516,16 @@ _ManageChangelogGnuton_()
     else
         if [ "$mode" = "download" ]
         then
-            _ChangelogVerificationCheck_ "auto"
+           if ! "$FlashStarted"
+           then
+               _ChangelogVerificationCheck_ "auto"
+           else
+               if ! _ChangelogVerificationCheck_ "interactive"
+               then
+                   _SendEMailNotification_ STOP_FW_UPDATE_APPROVAL
+                   return 1
+               fi
+           fi
         elif [ "$mode" = "view" ]
         then
             clear
@@ -7525,9 +7542,9 @@ _ManageChangelogGnuton_()
     return 0
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-10] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Apr-11] ##
+##------------------------------------------##
 _CheckNewUpdateFirmwareNotification_()
 {
    if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
@@ -7570,14 +7587,11 @@ _CheckNewUpdateFirmwareNotification_()
            Update_Custom_Settings FW_New_Update_Notification_Vers "$fwNewUpdateNotificationVers"
            Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
            "$mountWebGUI_OK" && sendNewUpdateStatusEmail=true
-           if ! "$FlashStarted"
+           if "$isGNUtonFW"
            then
-               if "$isGNUtonFW"
-               then
-                   _ManageChangelogGnuton_ "download"
-               else
-                   _ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
-               fi
+               _ManageChangelogGnuton_ "download"
+           else
+               _ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
            fi
        fi
    fi
@@ -7588,14 +7602,11 @@ _CheckNewUpdateFirmwareNotification_()
        fwNewUpdateNotificationDate="$(date +"$FW_UpdateNotificationDateFormat")"
        Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
        "$mountWebGUI_OK" && sendNewUpdateStatusEmail=true
-       if ! "$FlashStarted"
+       if "$isGNUtonFW"
        then
-           if "$isGNUtonFW"
-           then
-               _ManageChangelogGnuton_ "download"
-           else
-               _ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
-           fi
+           _ManageChangelogGnuton_ "download"
+       else
+           _ManageChangelogMerlin_ "download" "$fwNewUpdateNotificationVers"
        fi
    fi
 

From 789254e40a68ccd3b071aba0f0e29d2751f58b88 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Fri, 11 Apr 2025 02:07:36 -0400
Subject: [PATCH 10/16] Update MerlinAU.sh

---
 MerlinAU.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index ccbc4781..d5a6f23a 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -3841,7 +3841,7 @@ _CheckForMinimumModelSupport_()
     # List of unsupported models as a space-separated string
     local unsupported_models="RT-AC87U RT-AC56U RT-AC66U RT-AC3200 RT-AC88U RT-AC5300 RT-AC3100 RT-AC68U RT-AC66U_B1 RT-AC68UF RT-AC68P RT-AC1900P RT-AC1900 RT-N66U RT-N16 DSL-AC68U"
 
-    local current_model="$(_GetRouterProductID_)"
+    local current_model="RT-AC66U"
 
     # Check if current model is in the list of unsupported models #
     if echo "$unsupported_models" | grep -wq "$current_model"
@@ -10837,11 +10837,6 @@ _MainMenu_()
 ##-------------------------------------##
 _DoInitializationStartup_()
 {
-   if ! _CheckForMinimumRequirements_
-   then
-       printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
-       _DoExit_ 1
-   fi
 
    if [ $# -gt 0 ] && [ -n "$1" ] && \
       echo "$1" | grep -qE "^(install|startup)$"
@@ -10860,6 +10855,12 @@ _DoInitializationStartup_()
        _AutoServiceEvent_ create 2>/dev/null
    fi
 
+   if ! _CheckForMinimumRequirements_
+   then
+       printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
+       return 1
+   fi
+
    _CheckAndSetBackupOption_
    _SetDefaultBuildType_
 }

From ab43a44ff352ce33801d7932aec181836e1e1396 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Fri, 11 Apr 2025 02:10:04 -0400
Subject: [PATCH 11/16] Update MerlinAU.sh

---
 MerlinAU.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index d5a6f23a..19b75d4a 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -3841,7 +3841,7 @@ _CheckForMinimumModelSupport_()
     # List of unsupported models as a space-separated string
     local unsupported_models="RT-AC87U RT-AC56U RT-AC66U RT-AC3200 RT-AC88U RT-AC5300 RT-AC3100 RT-AC68U RT-AC66U_B1 RT-AC68UF RT-AC68P RT-AC1900P RT-AC1900 RT-N66U RT-N16 DSL-AC68U"
 
-    local current_model="RT-AC66U"
+    local current_model="$(_GetRouterProductID_)"
 
     # Check if current model is in the list of unsupported models #
     if echo "$unsupported_models" | grep -wq "$current_model"
@@ -10832,9 +10832,9 @@ _MainMenu_()
    done
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2025-Jan-15] ##
-##-------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2025-Jan-15] ##
+##------------------------------------------##
 _DoInitializationStartup_()
 {
 

From 149b1c8627b997f1b9fec8ec3d59f6a5525b4e6a Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Fri, 11 Apr 2025 03:04:51 -0700
Subject: [PATCH 12/16] Fix and Improvements

- Fixed bug introduced in PR #453 which was allowing installation in all unsupported models.
- Miscellaneous code improvements.
---
 MerlinAU.sh | 65 +++++++++++++++++++++++++++++------------------------
 README.md   |  2 +-
 version.txt |  2 +-
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index 19b75d4a..d047cf9c 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -3834,17 +3834,15 @@ _CheckForMinimumVersionSupport_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-05] ##
+## Modified by Martinski W. [2025-Apr-11] ##
 ##----------------------------------------##
 _CheckForMinimumModelSupport_()
 {
-    # List of unsupported models as a space-separated string
+    # List of UNSUPPORTED models as a space-separated string #
     local unsupported_models="RT-AC87U RT-AC56U RT-AC66U RT-AC3200 RT-AC88U RT-AC5300 RT-AC3100 RT-AC68U RT-AC66U_B1 RT-AC68UF RT-AC68P RT-AC1900P RT-AC1900 RT-N66U RT-N16 DSL-AC68U"
 
-    local current_model="$(_GetRouterProductID_)"
-
-    # Check if current model is in the list of unsupported models #
-    if echo "$unsupported_models" | grep -wq "$current_model"
+    # Check if current router is UNSUPPORTED #
+    if echo "$unsupported_models" | grep -wq "$PRODUCT_ID"
     then routerModelCheckFailed=true ; fi
 
     "$routerModelCheckFailed" && return 1 || return 0
@@ -7597,7 +7595,8 @@ _CheckNewUpdateFirmwareNotification_()
    fi
 
    fwNewUpdateNotificationDate="$(Get_Custom_Setting FW_New_Update_Notification_Date)"
-   if [ -z "$fwNewUpdateNotificationDate" ] || [ "$fwNewUpdateNotificationDate" = "TBD" ]
+   if [ -z "$fwNewUpdateNotificationDate" ] || \
+      [ "$fwNewUpdateNotificationDate" = "TBD" ]
    then
        fwNewUpdateNotificationDate="$(date +"$FW_UpdateNotificationDateFormat")"
        Update_Custom_Settings FW_New_Update_Notification_Date "$fwNewUpdateNotificationDate"
@@ -9300,9 +9299,9 @@ _DelScriptAutoUpdateHook_()
    fi
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2025-Jan-05] ##
-##-------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-11] ##
+##----------------------------------------##
 _CheckForMinimumRequirements_()
 {
    local requirementsCheckOK=true
@@ -9343,7 +9342,10 @@ _CheckForMinimumRequirements_()
        Say "\nThe NVRAM Custom JFFS Scripts option was ${GRNct}ENABLED${NOct}.\n"
    fi
 
-   "$requirementsCheckOK" && return 0 || return 1
+   "$requirementsCheckOK" && return 0
+
+   rm -f "$CONFIG_FILE"
+   return 1
 }
 
 ##-------------------------------------##
@@ -9404,7 +9406,7 @@ _DoInstallation_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-22] ##
+## Modified by Martinski W. [2025-Apr-11] ##
 ##----------------------------------------##
 _DoUnInstallation_()
 {
@@ -9416,11 +9418,14 @@ _DoUnInstallation_()
 
    local savedCFGPath="${SCRIPTS_PATH}/${SCRIPT_NAME}_CFG.SAVED.TXT"
 
-   printf "\n${BOLDct}Do you want to keep/save the $SCRIPT_NAME configuration file${NOct}"
-   if _WaitForYESorNO_ "$("$keepConfigFile" && echo YES || echo NO)"
+   if [ -f "$CONFIG_FILE" ]
    then
-       keepConfigFile=true
-       mv -f "$CONFIG_FILE" "$savedCFGPath"
+       printf "\n${BOLDct}Do you want to keep/save the $SCRIPT_NAME configuration file${NOct}"
+       if _WaitForYESorNO_ "$("$keepConfigFile" && echo YES || echo NO)"
+       then
+           keepConfigFile=true
+           mv -f "$CONFIG_FILE" "$savedCFGPath"
+       fi
    fi
 
    _DelFWAutoUpdateHook_
@@ -9803,12 +9808,12 @@ _EnableFWAutoUpdateChecks_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-12] ##
+## Modified by Martinski W. [2025-Apr-11] ##
 ##----------------------------------------##
 _ConfirmCronJobForFWAutoUpdates_()
 {
     if [ $# -gt 0 ] && [ -n "$1" ] && \
-       echo "$1" | grep -qE "^(install|startup)$"
+       echo "$1" | grep -qE "^(install|startup|uninstall)$"
     then return 1 ; fi
 
     # Check if the PREVIOUS Cron Job ID already exists #
@@ -10832,14 +10837,22 @@ _MainMenu_()
    done
 }
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2025-Jan-15] ##
-##------------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Apr-11] ##
+##----------------------------------------##
 _DoInitializationStartup_()
 {
+   local theParam=""
+   if [ $# -gt 0 ] && [ -n "$1" ] ; then theParam="$1" ; fi
 
-   if [ $# -gt 0 ] && [ -n "$1" ] && \
-      echo "$1" | grep -qE "^(install|startup)$"
+   if ! _CheckForMinimumRequirements_ && [ "$theParam" != "uninstall" ]
+   then
+       printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
+       _DoExit_ 1
+   fi
+
+   if [ -n "$theParam" ] && \
+      echo "$theParam" | grep -qE "^(install|startup|uninstall)$"
    then return 1 ; fi
 
    _CreateDirPaths_
@@ -10855,12 +10868,6 @@ _DoInitializationStartup_()
        _AutoServiceEvent_ create 2>/dev/null
    fi
 
-   if ! _CheckForMinimumRequirements_
-   then
-       printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
-       return 1
-   fi
-
    _CheckAndSetBackupOption_
    _SetDefaultBuildType_
 }
diff --git a/README.md b/README.md
index ff8ce15c..57951ba8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
 ## v1.4.2
-## 2025-Apr-09
+## 2025-Apr-11
 
 ## WebUI:
 ![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)
diff --git a/version.txt b/version.txt
index 2b912d35..8daa4912 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 1.4.2
-25040922
+25041102

From 59f4b242ea67f8c71922a78f7e6d7ea4722374be Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 12 Apr 2025 02:46:07 -0700
Subject: [PATCH 13/16] Code Improvement

Improved uninstallation workflow when users attempt to install MerlinAU on unsupported router models.

Now the code will automatically ask users to uninstall right after informing them that their current router model is unsupported. On such scenarios, this provides users a quick & easy way to uninstall.
---
 MerlinAU.sh | 20 +++++++++++++++-----
 README.md   |  2 +-
 version.txt |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index d047cf9c..657f80b5 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -4,7 +4,7 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Apr-11
+# Last Modified: 2025-Apr-12
 ###################################################################
 set -u
 
@@ -2280,13 +2280,13 @@ _CheckFor_VersionFile_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-11] ##
+## Modified by Martinski W. [2025-Apr-12] ##
 ##----------------------------------------##
 _Unmount_WebUI_()
 {
    if [ ! -f "$SCRIPT_WEB_ASP_PATH" ]
    then
-       Say "${CRITct}**ERROR**${NOct}: The WebUI page file for $SCRIPT_NAME is NOT found."
+       Say "${InvBYLWct}*INFO*${NOct}: The WebUI page file for $SCRIPT_NAME is NOT found."
        return 1
    fi
    local webPageFile
@@ -9411,7 +9411,7 @@ _DoInstallation_()
 _DoUnInstallation_()
 {
    "$isInteractive" && \
-   printf "\n${BOLDct}Are you sure you want to uninstall $ScriptFileName script now${NOct}"
+   printf "\n${BOLDct}Are you sure you want to uninstall $ScriptFileName now${NOct}"
    ! _WaitForYESorNO_ && return 0
 
    if ! _AcquireLock_ cliFileLock ; then return 1 ; fi
@@ -10838,7 +10838,7 @@ _MainMenu_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Apr-11] ##
+## Modified by Martinski W. [2025-Apr-12] ##
 ##----------------------------------------##
 _DoInitializationStartup_()
 {
@@ -10848,6 +10848,16 @@ _DoInitializationStartup_()
    if ! _CheckForMinimumRequirements_ && [ "$theParam" != "uninstall" ]
    then
        printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
+
+       "$isInteractive" && \
+        printf "\n${BOLDct}Would you like to uninstall $ScriptFileName now${NOct}"
+        if _WaitForYESorNO_
+        then
+            _DoUnInstallation_
+            _DoExit_ 0
+        fi
+        printf "\n${BOLDct}To manually uninstall $ScriptFileName use the following command:${NOct}"
+        printf "\n\n    ${BOLDct}$ScriptFilePath uninstall${NOct}\n\n"
        _DoExit_ 1
    fi
 
diff --git a/README.md b/README.md
index 57951ba8..35a90a26 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
 ## v1.4.2
-## 2025-Apr-11
+## 2025-Apr-12
 
 ## WebUI:
 ![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)
diff --git a/version.txt b/version.txt
index 8daa4912..41317097 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 1.4.2
-25041102
+25041202

From 4d4729429b13655799c17bd6a98fe2a0ce08e4f9 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Sun, 13 Apr 2025 23:00:51 -0400
Subject: [PATCH 14/16] Update MerlinAU.sh

---
 MerlinAU.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index c6467de7..657f80b5 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -12,7 +12,7 @@ set -u
 readonly SCRIPT_VERSION=1.4.2
 readonly SCRIPT_NAME="MerlinAU"
 ## Set to "master" for Production Releases ##
-SCRIPT_BRANCH="master"
+SCRIPT_BRANCH="dev"
 
 ##----------------------------------------##
 ## Modified by Martinski W. [2024-Jul-03] ##

From b2d1fb558c03cc4a9f397228903191f8379609a0 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Sun, 13 Apr 2025 23:04:56 -0400
Subject: [PATCH 15/16] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 35a90a26..36be3ec4 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
 ## v1.4.2
-## 2025-Apr-12
+## 2025-Apr-13
 
 ## WebUI:
-![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)
+![image](https://github.com/user-attachments/assets/a2197262-ca35-451a-8645-311896e1495e)
 
 ## CLI Shell Script:
-![image](https://github.com/user-attachments/assets/5c6460c1-d3c2-4374-a18a-14270dd578c6)
+![image](https://github.com/user-attachments/assets/b255e781-4a93-4e60-8517-edc7a5bf971d)
 ![image](https://github.com/user-attachments/assets/d05ec713-bacb-411b-903f-31bd1f04f49d)
 ![image](https://github.com/user-attachments/assets/8119aee0-e8ac-4bfb-a371-dfd74433ec5a)
 ![image](https://github.com/user-attachments/assets/33ef2735-acff-48c4-ab59-37622f2b8595)

From 9f2b4e4623819432cac6f1eaee4fe2aeaedd0192 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Sun, 13 Apr 2025 23:25:01 -0400
Subject: [PATCH 16/16] Update version.txt

---
 version.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/version.txt b/version.txt
index 41317097..9df886c4 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1 @@
 1.4.2
-25041202