From abfe0e98abe209edb23420df6c6c02fc1da77425 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 8 Mar 2025 02:44:49 -0800
Subject: [PATCH] WebGUI Funtionality Improvement

Added functionality to the WebGUI so that users can optionally select to run a "Router Login Test" when saving the password to verify that the login credentials are indeed valid. This is similar to the option available in the CLI menu where users can select to run the same router login test.
---
 MerlinAU.asp | 298 +++++++++++++++++++++++++++++++++++++++++----------
 MerlinAU.sh  | 277 +++++++++++++++++++++++++++++++++++++----------
 README.md    |   2 +-
 3 files changed, 463 insertions(+), 114 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 1ea2f6f4..32c56bcb 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,8 +29,8 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Mar-01 **/
-/** Intended for 1.4.0 Release **/
+/** Last Modified: 2025-Mar-07 **/
+/** Intended for 1.4.x Release **/
 /**----------------------------**/
 
 // Separate variables for shared and AJAX settings //
@@ -825,7 +825,7 @@ function ValidateDirectoryPath (formField, dirType)
 function GetExternalCheckResults()
 {
     $.ajax({
-        url: '/ext/MerlinAU/CheckHelper.js',
+        url: '/ext/MerlinAU/checkHelper.js',
         dataType: 'script',
         timeout: 5000,
         error: function(xhr){
@@ -890,45 +890,78 @@ function GetExternalCheckResults()
     });
 }
 
-/**-------------------------------------**/
-/** Added by Martinski W. [2025-Jan-13] **/
-/**-------------------------------------**/
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Mar-07] **/
+/**----------------------------------------**/
 // To support 'routerPassword' element //
 const loginPassword =
 {
-   minLen: 5, maxLen: 64, currLen: 0,
+   minLen: 5, maxLen: 64, pswdLen: 0, pswdStr: '',
+   pswdInvalid: false, pswdVerified: false, pswdUnverified: false,
+   allBlankCharsRegExp: '^[ ]+$',
+
    ErrorMsg: function()
    {
       const errStr = 'The password string is INVALID.';
-      if (this.currLen < this.minLen)
+      if (this.pswdLen < this.minLen)
       {
          const excMinLen = (this.minLen - 1);
-         return (`${errStr}\nThe string length must be greater than ${excMinLen} characters.`);
+         return (`${errStr} The string length must be greater than ${excMinLen} characters.`);
       }
-      if (this.currLen > this.maxLen)
+      if (this.pswdLen > this.maxLen)
       {
          const excMaxLen = (this.maxLen + 1);
-         return (`${errStr}\nThe string length must be less than ${excMaxLen} characters.`);
+         return (`${errStr} The string length must be less than ${excMaxLen} characters.`);
       }
+      if (this.pswdStr.match (`${this.allBlankCharsRegExp}`) !== null)
+      { return (`${errStr} The string cannot be all blank spaces.`); }
+      if (this.pswdInvalid) { return loginPswdInvalidMsge; }
    },
-   ValidateString: function(formField)
+   ErrorHint: function()
    {
-      const inputVal = formField.value;
-      const inputLen = formField.value.length;
-      this.currLen = inputLen;
-      if (inputLen < this.minLen || inputLen > this.maxLen)
+      const errStr = 'Password is <b>INVALID</b>.';
+      if (this.pswdLen < this.minLen)
+      {
+         const excMinLen = (this.minLen - 1);
+         return (`${errStr}<br>The string length must be greater than <b>${excMinLen}</b> characters.</br>`);
+      }
+      if (this.pswdLen > this.maxLen)
+      {
+         const excMaxLen = (this.maxLen + 1);
+         return (`${errStr}<br>The string length must be less than <b>${excMaxLen}</b> characters.</br>`);
+      }
+      if (this.pswdStr.match (`${this.allBlankCharsRegExp}`) !== null)
+      { return (`${errStr}<br>The string cannot be all blank spaces.<br>`); }
+      if (this.pswdInvalid) { return loginPswdInvalidHint; }
+      if (this.pswdVerified) { return loginPswdVerifiedMsg; }
+      if (this.pswdUnverified) { return loginPswdUnverifiedH; }
+   },
+   ValidateString: function (formField, eventID)
+   {
+      const pswdStr = formField.value;
+      if (this.pswdStr !== pswdStr && eventID === 'onKEYUP')
+      {
+          this.pswdInvalid = false;
+          this.pswdVerified = false;
+          this.pswdUnverified = false;
+      }
+      this.pswdStr = pswdStr;
+      this.pswdLen = pswdStr.length;
+      if (this.pswdInvalid || this.pswdVerified || this.pswdUnverified ||
+          this.pswdLen < this.minLen || this.pswdLen > this.maxLen ||
+          this.pswdStr.match (`${this.allBlankCharsRegExp}`) !== null)
       { return false; }
       else
       { return true; }
    }
 };
 
-/**-------------------------------------**/
-/** Added by Martinski W. [2025-Jan-13] **/
-/**-------------------------------------**/
-function ValidatePasswordString (formField)
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Mar-07] **/
+/**----------------------------------------**/
+function ValidatePasswordString (formField, eventID)
 {
-   if (loginPassword.ValidateString(formField))
+   if (loginPassword.ValidateString(formField, eventID))
    {
       $(formField).removeClass('Invalid');
       $(formField).off('mouseover');
@@ -936,11 +969,18 @@ function ValidatePasswordString (formField)
    }
    else
    {
+      let retStatus;
+      if (loginPassword.pswdVerified || loginPassword.pswdUnverified)
+      { retStatus = true; }
+      else
+      {
+         retStatus = false;
+         $(formField).addClass('Invalid');
+      }
       formField.focus();
-      $(formField).addClass('Invalid');
-      $(formField).on('mouseover',function(){return overlib(loginPassword.ErrorMsg(),0,0);});
+      $(formField).on('mouseover',function(){return overlib(loginPassword.ErrorHint(),0,0);});
       $(formField)[0].onmouseout = nd;
-      return false;
+      return retStatus;
    }
 }
 
@@ -962,6 +1002,17 @@ function togglePassword()
     eyeDiv.style.backgroundSize = 'contain';
 }
 
+/**-------------------------------------**/
+/** Added by Martinski W. [2025-Mar-07] **/
+/**-------------------------------------**/
+function ConfirmLoginTest(formInput)
+{
+   let confirmMsg = 'After saving the desired password, a router login test will be run to verify that MerlinAU can log in successfully.\n\nDuring this test, you will be automatically logged out of the WebUI. After the test is completed, you can log back in to check the status.\n\nPlease confirm you want to run the router login test when saving the password.';
+
+   if (formInput.checked && !confirm (confirmMsg))
+   { formInput.checked = false; }
+}
+
 /**----------------------------------------**/
 /** Modified by Martinski W. [2025-Jan-26] **/
 /**----------------------------------------**/
@@ -1148,8 +1199,17 @@ function SetUpEmailNotificationFields()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-25] **/
+/** Modified by Martinski W. [2025-Mar-07] **/
 /**----------------------------------------**/
+var loginPswdCheckStatus = 6;
+var loginPswdCheckMsgStr = 'UNKNOWN';
+let loginPswdHint = '';
+const loginPswdStatHintMsg = 'Login password for user:<br><b>LoginUSER</b></br>PswdSTATUS';
+const loginPswdVerifiedMsg = 'Status:<br>Login was succcessful.</br>Password is <b>verified</b>.';
+const loginPswdUnverifiedH = 'Status:<br>Password is <b>not</b> verified.</br>';
+const loginPswdInvalidHint = 'Status:<br>Login attempt FAILED.</br>Password is <b>INVALID</b>.';
+const loginPswdInvalidMsge = 'Login attempt FAILED. The password string is INVALID.\nPlease correct value and try again.';
+
 const emailNotifyHint = 'The Email Notifications option requires the AMTM email configuration settings to be enabled and set up.';
 
 const autoBackupsHint = 'The Automatic Backups option requires the BACKUPMON script to be installed on the router.';
@@ -1193,6 +1253,9 @@ function ShowHintMsg (formField)
        case 'TUF_BUILDTYPE':
            theHintMsg = TUF_BuildTypeMsg;
            break;
+       case 'LOGIN_PASSWD':
+           theHintMsg = loginPswdHint;
+           break;
        case 'CHANGELOG_CHECK':
            theHintMsg = changelogCheckHint;
            break;
@@ -1222,6 +1285,92 @@ function ShowHintMsg (formField)
    }
 }
 
+/**-------------------------------------**/
+/** Added by Martinski W. [2025-Mar-07] **/
+/**-------------------------------------**/
+function GetLoginPswdCheckStatus()
+{
+    $.ajax({
+        url: '/ext/MerlinAU/pswdCheckStatus.js',
+        dataType: 'script',
+        timeout: 5000,
+        error: function(xhr){
+            setTimeout(GetLoginPswdCheckStatus,1000);
+        },
+        success: function()
+        {
+            // Skip during form submission //
+            if (isFormSubmitting) { return ; }
+            let pswdStatusHint0, pswdStatusHint1;
+            let passwordFailed = false, pswdStatusText;
+            let pswdUnverified = false, pswdVerified = false;
+
+            switch (loginPswdCheckStatus)
+            {
+                case 0: //Empty String//
+                case 1: //No Access//
+                case 2: //Unchanged//
+                    pswdStatusText = 'Status:\n' + loginPswdCheckMsgStr;
+                    pswdStatusHint1 = 'Status:<br>' + loginPswdCheckMsgStr + '</br>';
+                    break;
+                case 4: //Verified//
+                    pswdVerified = true;
+                    pswdStatusText = 'Status:\n' + loginPswdCheckMsgStr;
+                    pswdStatusHint0 = loginPswdVerifiedMsg;
+                    pswdStatusHint1 = loginPswdVerifiedMsg;
+                    loginPassword.pswdVerified = true;
+                    loginPassword.pswdUnverified = false;
+                    break;
+                case 3: //Unverified//
+                    pswdUnverified = true;
+                    pswdStatusText = 'Status:\n' + loginPswdCheckMsgStr;
+                    pswdStatusHint0 = loginPswdUnverifiedH;
+                    pswdStatusHint1 = loginPswdUnverifiedH;
+                    loginPassword.pswdVerified = false;
+                    loginPassword.pswdUnverified = true;
+                    break;
+                case 5: //Failure//
+                    passwordFailed = true;
+                    pswdStatusText = 'Status:\n' + loginPswdCheckMsgStr;
+                    pswdStatusHint0 = loginPswdInvalidHint;
+                    pswdStatusHint1 = loginPswdInvalidHint;
+                    loginPassword.pswdInvalid = true;
+                    break;
+                case 6: //Unknown//
+                    pswdStatusText = 'Status:\n' + loginPswdCheckMsgStr;
+                    pswdStatusHint1 = 'Status:<br>UNKNOWN<br>';
+                    break;
+                default: //IGNORE//
+                    pswdStatusHint1 = '';
+                    break;
+            }
+
+            document.getElementById('LoginPswdStatusText').textContent = pswdStatusText;
+            showhide('LoginPswdStatusText',true);
+            loginPswdHint = loginPswdHint.replace (/PswdSTATUS/, pswdStatusHint1);
+
+            pswdField = document.getElementById('routerPassword');
+            if (passwordFailed || pswdVerified || pswdUnverified)
+            {
+                if (passwordFailed)
+                {
+                    alert(`**ERROR**\n${loginPswdInvalidMsge}`);
+                    $(pswdField).addClass('Invalid'); 
+                }
+                pswdField.focus();
+                $(pswdField).on('mouseover',function(){return overlib(pswdStatusHint0,0,0);});
+                $(pswdField)[0].onmouseout = nd;
+            }
+            else
+            {
+                $(pswdField).removeClass('Invalid');
+                $(pswdField).off('mouseover');
+            }
+            return;
+        }
+    });
+}
+
 /**----------------------------------------**/
 /** Modified by Martinski W. [2025-Feb-21] **/
 /**----------------------------------------**/
@@ -1251,7 +1400,7 @@ function BlockChangelog()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-23] **/
+/** Modified by Martinski W. [2025-Mar-07] **/
 /**----------------------------------------**/
 function InitializeFields()
 {
@@ -1259,6 +1408,8 @@ function InitializeFields()
     let changelogCheckEnabled = document.getElementById('changelogCheckEnabled');
     let fwNotificationsDate = document.getElementById('fwNotificationsDate');
     let routerPassword = document.getElementById('routerPassword');
+    let usernameElem = document.getElementById('http_username');
+    let loginUsername = 'admin';
     let fwUpdatePostponement = document.getElementById('fwUpdatePostponement');
     let autobackupEnabled = document.getElementById('autobackupEnabled');
     let rogFWBuildType = document.getElementById('rogFWBuildType');
@@ -1275,6 +1426,7 @@ function InitializeFields()
 
     $('#KeepConfigFile').prop('checked',false);
     $('#BypassPostponedDays').prop('checked',false);
+    $('#RunLoginTestOnSave').prop('checked',false);
 
     let FW_AutoUpdate_Check = document.getElementById('FW_AutoUpdate_Check');
     let fwUpdateCheckStatus = document.getElementById('fwUpdateCheckStatus');
@@ -1293,7 +1445,14 @@ function InitializeFields()
     if (custom_settings)
     {
         if (routerPassword)
-        { routerPassword.value = custom_settings.routerPassword || ''; }
+        {
+           if (custom_settings.routerPassword === 'TBD')
+           { routerPassword.value = ''; }
+           else
+           { routerPassword.value = custom_settings.routerPassword; }
+        }
+        loginUsername = usernameElem ? usernameElem.value.trim() : 'admin';
+        loginPswdHint = loginPswdStatHintMsg.replace (/LoginUSER/, loginUsername);
 
         if (fwUpdatePostponement)
         {
@@ -1515,7 +1674,7 @@ function Tokenize (inputStr)
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-21] **/
+/** Modified by Martinski W. [2025-Mar-07] **/
 /**----------------------------------------**/
 function GetConfigSettings()
 {
@@ -1590,6 +1749,7 @@ function GetConfigSettings()
             // Initialize fields with the merged settings //
             InitializeFields();
             GetExternalCheckResults();
+            GetLoginPswdCheckStatus();
         }
     });
 }
@@ -1791,7 +1951,7 @@ function initial()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-23] **/
+/** Modified by Martinski W. [2025-Mar-07] **/
 /**----------------------------------------**/
 function SaveActionsConfig()
 {
@@ -1799,18 +1959,18 @@ function SaveActionsConfig()
     document.getElementById('amng_custom').value = '';
 
     // Collect Action form-specific settings //
-    var passwordStr = document.getElementById('routerPassword')?.value || '';
-    var usernameElement = document.getElementById('http_username');
-    var username = usernameElement ? usernameElement.value.trim() : 'admin';
+    var passwordElem = document.getElementById('routerPassword');
+    var usernameElem = document.getElementById('http_username');
+    var usernameStr = usernameElem ? usernameElem.value.trim() : 'admin';
 
-    // Validate that username is not empty //
-    if (!username)
+    // Validate that Username is not empty //
+    if (usernameStr === null || usernameStr.length === 0)
     {
-        console.error("HTTP username is missing.");
-        alert("HTTP username is not set. Please contact your administrator.");
+        console.error("HTTP Username is missing.");
+        alert("HTTP Username is not set. Please contact your administrator.");
         return false;
     }
-    if (!ValidatePasswordString (document.getElementById('routerPassword')))
+    if (!ValidatePasswordString (passwordElem, 'onSAVE'))
     {
         alert(`${validationErrorMsg}\n\n` + loginPassword.ErrorMsg());
         return false;
@@ -1842,7 +2002,7 @@ function SaveActionsConfig()
     fwUpdateRawCronSchedule = FWConvertWebUISettingsToCronSchedule (fwUpdateRawCronSchedule);
 
     // Encode credentials in Base64 //
-    var credentials = username + ':' + passwordStr;
+    var credentials = usernameStr + ':' + passwordElem.value;
     var encodedCredentials = btoa(credentials);
 
     // Collect only Action form-specific settings //
@@ -1884,8 +2044,14 @@ function SaveActionsConfig()
     // Save merged settings to the hidden input field //
     document.getElementById('amng_custom').value = JSON.stringify(updatedSettings);
 
+    let actionScriptValue;
+    if (!document.getElementById('RunLoginTestOnSave').checked)
+    { actionScriptValue = 'start_MerlinAUconfig'; }
+    else
+    { actionScriptValue = 'start_MerlinAUconfig_runLoginTest'; }
+
     // Apply the settings //
-    document.form.action_script.value = 'start_MerlinAUconfig';
+    document.form.action_script.value = actionScriptValue;
     document.form.action_wait.value = 10;
     showLoading();
     document.form.submit();
@@ -2014,14 +2180,14 @@ function Uninstall()
    if (!confirm("Are you sure you want to completely uninstall MerlinAU?"))
    { return; }
 
-   let actionScriptVal;
+   let actionScriptValue;
    let keepConfigFile = document.getElementById('KeepConfigFile');
    if (!keepConfigFile.checked)
-   { actionScriptVal = 'start_MerlinAUuninstall'; }
+   { actionScriptValue = 'start_MerlinAUuninstall'; }
    else
-   { actionScriptVal = 'start_MerlinAUuninstall_keepConfig'; }
+   { actionScriptValue = 'start_MerlinAUuninstall_keepConfig'; }
 
-   document.form.action_script.value = actionScriptVal;
+   document.form.action_script.value = actionScriptValue;
    document.form.action_wait.value = 10;
    showLoading();
    document.form.submit();
@@ -2034,22 +2200,22 @@ function CheckFirmwareUpdate()
 {
    console.log("Initiating F/W Update Check...");
 
-   let actionScriptVal;
+   let actionScriptValue;
    let bypassPostponedDays = document.getElementById('BypassPostponedDays');
    if (!bypassPostponedDays.checked)
    {
-       actionScriptVal = 'start_MerlinAUcheckupdate';
+       actionScriptValue = 'start_MerlinAUcheckupdate';
        if (!confirm("NOTE:\nIf you have no postponement days set or remaining, the firmware may flash NOW!\nThis means logging you out of the WebUI and rebooting the router.\nContinue to check for firmware updates now?"))
        { return; }
    }
    else
    {
-       actionScriptVal = 'start_MerlinAUcheckupdate_bypassDays';
+       actionScriptValue = 'start_MerlinAUcheckupdate_bypassDays';
        if (!confirm("NOTE:\nThe firmware may flash NOW!\nThis means logging you out of the WebUI and rebooting the router.\nContinue to check for firmware updates now?"))
        { return; }
    }
 
-   document.form.action_script.value = actionScriptVal;
+   document.form.action_script.value = actionScriptValue;
    document.form.action_wait.value = 60;
    showLoading();
    document.form.submit();
@@ -2425,20 +2591,27 @@ function initializeCollapsibleSections()
 </colgroup>
 <tr>
    <td style="text-align: left;">
-     <label for="routerPassword">Router Login Password</label>
+     <label for="routerPassword">
+     <a class="hintstyle" name="LOGIN_PASSWD" href="javascript:void(0);"
+        onclick="ShowHintMsg(this);">Router Login Password</a>
+     </label>
+     <br>
+     <span class="settingname" id="LoginPswdStatusText" name="LoginPswdStatusText"
+        style="margin-top:10px; display:none; font-size:12px; font-weight:bolder;"></span>
+     </br>
    </td>
    <td>
-      <div style="display: inline-block;">
+   <div style="display: inline-block;">
          <input
            type="password"
            id="routerPassword"
            name="routerPassword"
            placeholder="Enter password"
-           style="width: 278px; display: inline-block;"
+           style="width: 278px; display: inline-block; margin-left:2px; margin-top:3px;"
            maxlength="64"
            onKeyPress="return validator.isString(this, event)"
-           onblur="ValidatePasswordString(this)"
-           onkeyup="ValidatePasswordString(this)"/>
+           onblur="ValidatePasswordString(this,'onBLUR')"
+           onkeyup="ValidatePasswordString(this,'onKEYUP')"/>
          <div
              id="eyeToggle"
              onclick="togglePassword();"
@@ -2451,14 +2624,20 @@ function initializeCollapsibleSections()
                background:url('/images/icon-visible@2x.png') no-repeat center;
                background-size: contain;
                cursor: pointer;"></div>
-      </div>
+   </div>
+   <br>
+   <label style="color:#FFCC00; margin-left:0px; margin-top:0px; margin-bottom:0px;">
+   <input class="input" type="checkbox" checked="" name="RunLoginTestOnSave" id="RunLoginTestOnSave"
+        style="vertical-align:bottom; margin-left:2px; margin-right:5px; margin-top:13px; margin-bottom:4px;" onclick="ConfirmLoginTest(this);"/>Run login test when saving password</label>
+   </br>
    </td>
 </tr>
 <tr>
    <td style="text-align: left;"><label for="FW_AutoUpdate_Check">Enable Automatic F/W Update Checks</label></td>
    <td>
-      <input type="checkbox" id="FW_AutoUpdate_Check" name="FW_AutoUpdate_Check"/>
-      <span id="FW_AutoUpdate_CheckSchedText" style="margin-left:10px; display:none; font-size: 12px; font-weight: bolder;"></span>
+      <input type="checkbox" id="FW_AutoUpdate_Check" name="FW_AutoUpdate_Check" style="margin-left:2px;"/>
+      <span id="FW_AutoUpdate_CheckSchedText" name="FW_AutoUpdate_CheckSchedText"
+       style="vertical-align:bottom; margin-left:15px; display:none; font-size: 12px; font-weight: bolder;"></span>
    </td>
 </tr>
 <tr>
@@ -2468,7 +2647,7 @@ function initializeCollapsibleSections()
    <td>
    <input autocomplete="off" type="text"
      id="fwUpdatePostponement" name="fwUpdatePostponement"
-     style="width: 7%;" maxlength="3"
+     style="width: 7%; margin-left: 2px;" maxlength="3"
      onKeyPress="return validator.isNumber(this,event)"
      onkeyup="ValidatePostponedDays(this)"
      onblur="ValidatePostponedDays(this);FormatNumericSetting(this)"/>
@@ -2481,7 +2660,9 @@ function initializeCollapsibleSections()
          onclick="ShowHintMsg(this);">Enable F/W Changelog Check</a>
       </label>
    </td>
-   <td><input type="checkbox" id="changelogCheckEnabled" name="changelogCheckEnabled" /></td>
+   <td>
+   <input type="checkbox" id="changelogCheckEnabled" name="changelogCheckEnabled" style="margin-left:2px;"/>
+   </td>
 </tr>
 <!--
 ** F/W Update Check Cron Schedule **
@@ -2645,7 +2826,8 @@ function initializeCollapsibleSections()
    </td>
    <td>
       <input type="checkbox" id="Script_AutoUpdate_Check" name="Script_AutoUpdate_Check"/>
-      <span id="Script_AutoUpdate_SchedText" style="margin-left:10px; display:none; font-size: 12px; font-weight: bolder;"></span>
+      <span id="Script_AutoUpdate_SchedText" name="Script_AutoUpdate_SchedText"
+       style="vertical-align:bottom; margin-left:15px; display:none; font-size: 12px; font-weight: bolder;"></span>
    </td>
 </tr>
 <tr id="rogFWBuildRow">
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 3c6b9ea1..9814c76c 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-Feb-25
+# Last Modified: 2025-Mar-07
 ###################################################################
 set -u
 
@@ -91,6 +91,7 @@ readonly SETTINGS_DIR="${ADDONS_PATH}/$ScriptDirNameD"
 readonly CONFIG_FILE="${SETTINGS_DIR}/custom_settings.txt"
 readonly SCRIPT_VERPATH="${SETTINGS_DIR}/version.txt"
 readonly HELPER_JSFILE="${SETTINGS_DIR}/CheckHelper.js"
+readonly PSWD_CHECK_JS="${SETTINGS_DIR}/PswdCheckStatus.js"
 readonly SHARED_SETTINGS_FILE="${ADDONS_PATH}/custom_settings.txt"
 readonly SHARED_WEB_DIR="$(readlink -f /www/user)"
 readonly SCRIPT_WEB_DIR="${SHARED_WEB_DIR}/$SCRIPT_NAME"
@@ -170,6 +171,7 @@ MerlinChangeLogURL=""
 GnutonChangeLogURL=""
 keepConfigFile=false
 bypassPostponedDays=false
+runLoginCredentialsTest=false
 
 # Main LAN Network Info #
 readonly myLAN_HostName="$(nvram get lan_hostname)"
@@ -235,7 +237,7 @@ routerLoginFailureMsg="Please try the following:
 1. Confirm that you are *not* already logged into the router webGUI using a web browser.
 2. Check that the \"Enable Access Restrictions\" option from the webGUI is *not* set up
    to restrict access to the router webGUI from the router's IP address [${GRNct}${mainLAN_IPaddr}${NOct}].
-3. Confirm your password via the \"Set Router Login Credentials\" option from the Main Menu."
+3. Confirm your password via the \"Set Router Login Password\" option from the Main Menu."
 
 [ -t 0 ] && ! tty | grep -qwi "NOT" && isInteractive=true
 
@@ -1002,8 +1004,107 @@ _SetUp_FW_UpdateLOG_DirectoryPaths_()
    FW_LOG_DIR="${FW_LOG_BASE_DIR}/$FW_LOG_SUBDIR"
 }
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Mar-07] ##
+##-------------------------------------##
+_WriteVarDefToPswdCheckJSFile_()
+{
+   if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
+   then return 1; fi
+
+   local varValue  fixedVal
+   if [ $# -eq 3 ] && [ "$3" = "true" ]
+   then varValue="$2"
+   else varValue="'${2}'"
+   fi
+
+   if [ ! -s "$PSWD_CHECK_JS" ]
+   then
+       echo "var $1 = ${varValue};" > "$PSWD_CHECK_JS"
+   elif ! grep -q "^var $1 =.*" "$PSWD_CHECK_JS"
+   then
+       echo "var $1 = ${varValue};" >> "$PSWD_CHECK_JS"
+   elif ! grep -q "^var $1 = ${varValue};" "$PSWD_CHECK_JS"
+   then
+       fixedVal="$(echo "$varValue" | sed 's/[\/&]/\\&/g')"
+       sed -i "s/^var $1 =.*/var $1 = ${fixedVal};/" "$PSWD_CHECK_JS"
+   fi
+}
+
+##-------------------------------------##
+## Added by Martinski W. [2025-Mar-07] ##
+##-------------------------------------##
+_GetLoginPswdCheckStatusJS_()
+{
+   if [ ! -s "$PSWD_CHECK_JS" ] ; then echo "0" ; return 0 ; fi
+   local checkCode
+   checkCode="$(grep "^var loginPswdCheckStatus =" "$PSWD_CHECK_JS" | awk -F '[ ;]' '{print $4}')"
+   if [ -z "$checkCode" ]
+   then echo "0"
+   else echo "$checkCode"
+   fi
+   return 0
+}
+
+##-------------------------------------##
+## Added by Martinski W. [2025-Mar-07] ##
+##-------------------------------------##
+_UpdateLoginPswdCheckHelper_()
+{
+   if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi
+   local checkCode  checkMsge  prevChkCode
+
+   case "$1" in
+       InitPWD)
+           checkCode=0
+           checkMsge="Password is EMPTY."
+           ;;
+       NoACCESS)
+           checkCode=1
+           checkMsge="Login access is RESTRICTED."
+           ;;
+       OldPSWD)
+           prevChkCode="$(_GetLoginPswdCheckStatusJS_)"
+           if [ -n "$prevChkCode" ] && [ "$prevChkCode" -gt 1 ]
+           then
+               return 0
+           else
+               checkCode=2
+               checkMsge="Password is unchanged."
+           fi
+           ;;
+       NewPSWD)
+           checkCode=3
+           checkMsge="Password is NOT verified."
+           ;;
+       SUCCESS)
+           checkCode=4
+           checkMsge="Password is verified."
+           ;;
+       FAILURE)
+           checkCode=5
+           checkMsge="Password is INVALID."
+           ;;
+       UNKNOWN)
+           prevChkCode="$(_GetLoginPswdCheckStatusJS_)"
+           if [ -n "$prevChkCode" ] && [ "$prevChkCode" -gt 1 ]
+           then
+               return 0
+           else
+               checkCode=6
+               checkMsge="UNKNOWN"
+           fi
+           ;;
+       *) ##IGNORE##
+           return 1 ;;
+   esac
+
+   _WriteVarDefToPswdCheckJSFile_ "loginPswdCheckStatus" "$checkCode" true
+   _WriteVarDefToPswdCheckJSFile_ "loginPswdCheckMsgStr" "$checkMsge"
+}
+
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-05] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _InitCustomSettingsConfig_()
 {
@@ -1023,6 +1124,7 @@ _InitCustomSettingsConfig_()
          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 "credentials_base64 TBD"
          echo "CheckChangeLog ENABLED"
          echo "FW_Update_Check TBD"
          echo "Allow_Updates_OverVPN DISABLED"
@@ -1031,6 +1133,7 @@ _InitCustomSettingsConfig_()
          echo "Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\""
       } > "$CONFIG_FILE"
       chmod 664 "$CONFIG_FILE"
+      _UpdateLoginPswdCheckHelper_ InitPWD
       return 1
    fi
    local retCode=0  preferredPath
@@ -1084,34 +1187,42 @@ _InitCustomSettingsConfig_()
        sed -i "9 i FW_New_Update_LOG_Preferred_Path=\"${preferredPath}\"" "$CONFIG_FILE"
        retCode=1
    fi
+   if ! grep -q "^credentials_base64 " "$CONFIG_FILE"
+   then
+       sed -i "10 i credentials_base64 TBD" "$CONFIG_FILE"
+       _UpdateLoginPswdCheckHelper_ InitPWD
+       retCode=1
+   else
+       _UpdateLoginPswdCheckHelper_ UNKNOWN
+   fi
    if ! grep -q "^CheckChangeLog " "$CONFIG_FILE"
    then
-       sed -i "10 i CheckChangeLog ENABLED" "$CONFIG_FILE"
+       sed -i "11 i CheckChangeLog ENABLED" "$CONFIG_FILE"
        retCode=1
    fi
    if ! grep -q "^FW_Update_Check " "$CONFIG_FILE"
    then
-       sed -i "11 i FW_Update_Check TBD" "$CONFIG_FILE"
+       sed -i "12 i FW_Update_Check TBD" "$CONFIG_FILE"
        retCode=1
    fi
    if ! grep -q "^Allow_Updates_OverVPN " "$CONFIG_FILE"
    then
-       sed -i "12 i Allow_Updates_OverVPN DISABLED" "$CONFIG_FILE"
+       sed -i "13 i Allow_Updates_OverVPN DISABLED" "$CONFIG_FILE"
        retCode=1
    fi
    if ! grep -q "^FW_Allow_Beta_Production_Up " "$CONFIG_FILE"
    then
-       sed -i "13 i FW_Allow_Beta_Production_Up ENABLED" "$CONFIG_FILE"
+       sed -i "14 i FW_Allow_Beta_Production_Up ENABLED" "$CONFIG_FILE"
        retCode=1
    fi
    if ! grep -q "^Allow_Script_Auto_Update " "$CONFIG_FILE"
    then
-       sed -i "14 i Allow_Script_Auto_Update DISABLED" "$CONFIG_FILE"
+       sed -i "15 i Allow_Script_Auto_Update DISABLED" "$CONFIG_FILE"
        retCode=1
    fi
    if ! grep -q "^Script_Update_Cron_Job_SchedDays=" "$CONFIG_FILE"
    then
-       sed -i "15 i Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\"" "$CONFIG_FILE"
+       sed -i "16 i Script_Update_Cron_Job_SchedDays=\"${SW_Update_CRON_DefaultSchedDays}\"" "$CONFIG_FILE"
        retCode=1
    fi
    dos2unix "$CONFIG_FILE"
@@ -2217,7 +2328,7 @@ _CreateDirPaths_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-20] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _CreateSymLinks_()
 {
@@ -2227,19 +2338,20 @@ _CreateSymLinks_()
    fi
    ! "$inRouterSWmode" && return 0
 
-   ln -s "$CONFIG_FILE" "${SCRIPT_WEB_DIR}/config.htm" 2>/dev/null
-   ln -s "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/CheckHelper.js" 2>/dev/null
+   ln -sf "$CONFIG_FILE" "${SCRIPT_WEB_DIR}/config.htm" 2>/dev/null
+   ln -sf "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/checkHelper.js" 2>/dev/null
+   ln -sf "$PSWD_CHECK_JS" "${SCRIPT_WEB_DIR}/pswdCheckStatus.js" 2>/dev/null
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Feb-08] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _WriteVarDefToHelperJSFile_()
 {
    if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
    then return 1; fi
 
-   local varValue
+   local varValue  fixedVal
    if [ $# -eq 3 ] && [ "$3" = "true" ]
    then varValue="$2"
    else varValue="'${2}'"
@@ -2253,7 +2365,8 @@ _WriteVarDefToHelperJSFile_()
        echo "var $1 = ${varValue};" >> "$HELPER_JSFILE"
    elif ! grep -q "^var $1 = ${varValue};" "$HELPER_JSFILE"
    then
-       sed -i "s/^var $1 =.*/var $1 = ${varValue};/" "$HELPER_JSFILE"
+       fixedVal="$(echo "$varValue" | sed 's/[\/&]/\\&/g')"
+       sed -i "s/^var $1 =.*/var $1 = ${fixedVal};/" "$HELPER_JSFILE"
    fi
 }
 
@@ -2349,13 +2462,14 @@ _ActionsAfterNewConfigSettings_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-25] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _UpdateConfigFromWebUISettings_()
 {
    [ ! -f "$SHARED_SETTINGS_FILE" ] && return 1
 
    local settingsMergeOK=true  logMsgTag="with errors."
+   local oldLoginCredsENC  doRouterLoginTest=false
 
    # Check for 'MerlinAU_' entries excluding 'version' #
    if [ "$(grep "^MerlinAU_" "$SHARED_SETTINGS_FILE" | grep -vc "_version")" -gt 0 ]
@@ -2393,11 +2507,19 @@ _UpdateConfigFromWebUISettings_()
                fi
                continue
            fi
-
            if [ "$keySettingName" = "FW_New_Update_Cron_Job_Schedule" ]
            then  # Replace delimiter char placed by the WebGUI #
                keySettingValue="$(echo "$keySettingValue" | sed 's/|/ /g')"
            fi
+           if [ "$keySettingName" = "credentials_base64" ]
+           then
+               oldLoginCredsENC="$(Get_Custom_Setting credentials_base64)"
+               if [ "$oldLoginCredsENC" = "$keySettingValue" ]
+               then _UpdateLoginPswdCheckHelper_ OldPSWD
+               else _UpdateLoginPswdCheckHelper_ NewPSWD
+               fi
+               doRouterLoginTest="$runLoginCredentialsTest"
+           fi
            Update_Custom_Settings "$keySettingName" "$keySettingValue"
        done < "$TEMPFILE"
 
@@ -2420,6 +2542,9 @@ _UpdateConfigFromWebUISettings_()
        then  ## Reset for Next Check ##
            { sleep 15 ; _UpdateHelperJSFile_ "$extCheckALLvarID" "true" ; } &
        fi
+
+       // Do this ONLY IF requested by user //
+       "$doRouterLoginTest" && _TestLoginCredentials_
    else
        Say "No updated settings from WebUI found. No merge into $CONFIG_FILE necessary."
    fi
@@ -3530,12 +3655,16 @@ _CheckForMinimumModelSupport_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-Aug-15] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _TestLoginCredentials_()
 {
-    local credsBase64="$1"
-    local curl_response routerURLstr
+    local credsENC  curlResponse  routerURLstr
+
+    if [ $# -gt 0 ] && [ -n "$1" ]
+    then credsENC="$1"
+    else credsENC="$(Get_Custom_Setting credentials_base64)"
+    fi
 
     # Define routerURLstr #
     routerURLstr="$(_GetRouterURL_)"
@@ -3544,31 +3673,32 @@ _TestLoginCredentials_()
     /sbin/service restart_httpd >/dev/null 2>&1 &
     sleep 5
 
-    curl_response="$(curl -k "${routerURLstr}/login.cgi" \
+    curlResponse="$(curl -k "${routerURLstr}/login.cgi" \
     --referer "${routerURLstr}/Main_Login.asp" \
     --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0' \
     -H 'Accept-Language: en-US,en;q=0.5' \
     -H 'Content-Type: application/x-www-form-urlencoded' \
     -H "Origin: ${routerURLstr}/" \
     -H 'Connection: keep-alive' \
-    --data-raw "group_id=&action_mode=&action_script=&action_wait=5&current_page=Main_Login.asp&next_page=index.asp&login_authorization=${credsBase64}" \
+    --data-raw "group_id=&action_mode=&action_script=&action_wait=5&current_page=Main_Login.asp&next_page=index.asp&login_authorization=${credsENC}" \
     --cookie-jar /tmp/cookie.txt)"
 
-    # Interpret the curl_response to determine login success or failure #
-    # This is a basic check #
-    if echo "$curl_response" | grep -Eq 'url=index\.asp|url=GameDashboard\.asp'
+    # Determine login success or failure. This is a basic check #
+    if echo "$curlResponse" | grep -Eq 'url=index\.asp|url=GameDashboard\.asp'
     then
+        _UpdateLoginPswdCheckHelper_ SUCCESS
         printf "\n${GRNct}Router Login test passed.${NOct}"
         printf "\nRestarting web server... Please wait.\n"
         /sbin/service restart_httpd >/dev/null 2>&1 &
-        sleep 1
+        sleep 2
         return 0
     else
+        _UpdateLoginPswdCheckHelper_ FAILURE
         printf "\n${REDct}**ERROR**${NOct}: Router Login test failed.\n"
         printf "\n${routerLoginFailureMsg}\n\n"
         if _WaitForYESorNO_ "Would you like to try again?"
         then return 1  # Indicates failure but with intent to retry #
-        else return 0  # User opted not to retry; do a graceful exit #
+        else return 0  # User opted not to retry so just return #
         fi
     fi
 }
@@ -3795,13 +3925,13 @@ _GetKeypressInput_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-Jul-31] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _GetPasswordInput_()
 {
    local PSWDstrLenMIN=5  PSWDstrLenMAX=64
-   local newPSWDstring  newPSWDtmpStr  PSWDprompt
-   local retCode  charNum  newPSWDlength  showPSWD
+   local newPSWDtmpStr  PSWDprompt  showPSWD
+   local retCode=1  charNum  newPSWDlength
    # For more responsive TAB keypress debounce #
    local tabKeyDebounceSem="/tmp/var/tmp/${ScriptFNameTag}_TabKeySEM.txt"
 
@@ -3815,7 +3945,7 @@ _GetPasswordInput_()
    _TabKeyDebounceWait_()
    {
       touch "$tabKeyDebounceSem"
-      usleep 300000   #0.3 sec#
+      usleep 333000   #~0.3 sec#
       rm -f "$tabKeyDebounceSem"
    }
 
@@ -3830,16 +3960,23 @@ _GetPasswordInput_()
    _ShowPSWDPrompt_()
    {
       local pswdTemp  LENct  LENwd
-      [ "$showPSWD" = "1" ] && pswdTemp="$newPSWDstring" || pswdTemp="$newPSWDtmpStr"
-      if [ "$newPSWDlength" -lt "$PSWDstrLenMIN" ] || [ "$newPSWDlength" -gt "$PSWDstrLenMAX" ]
-      then LENct="$REDct" ; LENwd=""
-      else LENct="$GRNct" ; LENwd="02"
+      if [ "$showPSWD" = "1" ]
+      then pswdTemp="$newPSWDstring"
+      else pswdTemp="$newPSWDtmpStr"
       fi
-      printf "\r\033[0K$PSWDprompt [Length=${LENct}%${LENwd}d${NOct}]: %s" "$newPSWDlength" "$pswdTemp"
+      if [ "$newPSWDlength" -eq 0 ]
+      then LENwd="" ; else LENwd="02"
+      fi
+      if [ "$newPSWDlength" -lt "$PSWDstrLenMIN" ] || \
+         [ "$newPSWDlength" -gt "$PSWDstrLenMAX" ]
+      then LENct="$REDct" ; else LENct="$GRNct"
+      fi
+      printf "\033[1A\r\033[0K${PSWDprompt}\n"
+      printf "\r\033[0K[Length=${LENct}%${LENwd}d${NOct}]: %s" "$newPSWDlength" "$pswdTemp"
    }
 
-   showPSWD=0
    charNum=""
+   showPSWD=0
    newPSWDstring="$thePWSDstring"
    newPSWDlength="${#newPSWDstring}"
    newPSWDtmpStr="$(_ShowAsterisks_ "$newPSWDlength")"
@@ -3852,20 +3989,25 @@ _GetPasswordInput_()
 
       if [ "$charNum" -eq 0 ] || [ "$charNum" -eq 10 ] || [ "$charNum" -eq 13 ]
       then
-          if [ "$newPSWDlength" -ge "$PSWDstrLenMIN" ] && [ "$newPSWDlength" -le "$PSWDstrLenMAX" ]
+          if echo "$newPSWDstring" | grep -qE "^[[:blank:]]+$"
+          then
+              newPSWDstring=""
+              printf "\n\n${REDct}**ERROR**${NOct}: Password string cannot be all blank spaces.\n"
+              retCode=1
+          elif [ "$newPSWDlength" -ge "$PSWDstrLenMIN" ] && [ "$newPSWDlength" -le "$PSWDstrLenMAX" ]
           then
               echo
               retCode=0
           elif [ "$newPSWDlength" -lt "$PSWDstrLenMIN" ]
           then
               newPSWDstring=""
-              printf "\n${REDct}**ERROR**${NOct}: Password length is less than allowed minimum length "
+              printf "\n\n${REDct}**ERROR**${NOct}: Password length is less than allowed minimum length "
               printf "[MIN=${GRNct}${PSWDstrLenMIN}${NOct}].\n"
               retCode=1
           elif [ "$newPSWDlength" -gt "$PSWDstrLenMAX" ]
           then
               newPSWDstring=""
-              printf "\n${REDct}**ERROR**${NOct}: Password length is greater than allowed maximum length "
+              printf "\n\n${REDct}**ERROR**${NOct}: Password length is greater than allowed maximum length "
               printf "[MAX=${GRNct}${PSWDstrLenMAX}${NOct}].\n"
               retCode=1
           fi
@@ -3921,7 +4063,7 @@ _GetPasswordInput_()
       ## ONLY 7-bit ASCII printable characters are VALID ##
       if [ "$charNum" -gt 31 ] && [ "$charNum" -lt 127 ]
       then
-          if [ "$newPSWDlength" -le "$PSWDstrLenMAX" ]
+          if [ "$newPSWDlength" -lt "$PSWDstrLenMAX" ]
           then
               newPSWDstring="${newPSWDstring}${theChar}"
               newPSWDlength="${#newPSWDstring}"
@@ -3933,8 +4075,14 @@ _GetPasswordInput_()
    done
    IFS="$savedIFS"
 
+   if [ "$retCode" -ne 0 ]
+   then
+       _WaitForEnterKey_
+       _GetPasswordInput_ "$1"
+   fi
+
    thePWSDstring="$newPSWDstring"
-   return "$retCode"
+   return
 }
 
 ##-------------------------------------##
@@ -4031,18 +4179,19 @@ with the \"${GRNct}Web UI${NOct}\" access type on the \"Access restriction list\
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-Aug-16] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _GetLoginCredentials_()
 {
-    local retry="yes"  userName  savedMsg
-    local oldPWSDstring  thePWSDstring
+    local retry="yes"  userName  savedMsgStr
     local loginCredsENC  loginCredsDEC
+    local oldPWSDstring  newPSWDstring  thePWSDstring
 
     # Check if WebGUI access is NOT restricted #
     if ! _CheckWebGUILoginAccessOK_
     then
         _WaitForEnterKey_ "$mainMenuReturnPromptStr"
+        _UpdateLoginPswdCheckHelper_ NoACCESS
         return 1
     fi
 
@@ -4053,16 +4202,19 @@ _GetLoginCredentials_()
     if [ -z "$loginCredsENC" ] || [ "$loginCredsENC" = "TBD" ]
     then
         thePWSDstring=""
+        _UpdateLoginPswdCheckHelper_ InitPWD
     else
         loginCredsDEC="$(echo "$loginCredsENC" | openssl base64 -d)"
         thePWSDstring="$(echo "$loginCredsDEC" | sed "s/${userName}://")"
     fi
     oldPWSDstring="$thePWSDstring"
+    newPSWDstring="$thePWSDstring"
 
     while [ "$retry" = "yes" ]
     do
-        echo "=== Login Credentials ==="
+        printf "=== Login Credentials ===\n\n"
         _GetPasswordInput_ "Enter password for user ${GRNct}${userName}${NOct}"
+
         if [ -z "$thePWSDstring" ]
         then
             printf "\nPassword string is ${REDct}NOT${NOct} valid. Credentials were not saved.\n"
@@ -4076,10 +4228,14 @@ _GetLoginCredentials_()
         Update_Custom_Settings credentials_base64 "$loginCredsENC"
 
         if [ "$thePWSDstring" != "$oldPWSDstring" ]
-        then savedMsg="${GRNct}New credentials saved.${NOct}"
-        else savedMsg="${GRNct}Credentials remain unchanged.${NOct}"
+        then
+            _UpdateLoginPswdCheckHelper_ NewPSWD
+            savedMsgStr="${GRNct}New credentials saved.${NOct}"
+        else
+            _UpdateLoginPswdCheckHelper_ OldPSWD
+            savedMsgStr="${GRNct}Credentials remain unchanged.${NOct}"
         fi
-        printf "\n${savedMsg}\n"
+        printf "\n${savedMsgStr}\n"
         printf "Encoded Credentials:\n"
         printf "${GRNct}$loginCredsENC${NOct}\n"
 
@@ -4196,9 +4352,9 @@ _GetNodeURL_()
     echo "${urlProto}://${NodeIP_Address}${urlPort}"
 }
 
-##---------------------------------------##
-## Added by ExtremeFiretop [2024-Mar-26] ##
-##---------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Mar-07] ##
+##----------------------------------------##
 _GetNodeInfo_()
 {
     local NodeIP_Address="$1"
@@ -4226,6 +4382,7 @@ _GetNodeInfo_()
     credsBase64="$(Get_Custom_Setting credentials_base64)"
     if [ -z "$credsBase64" ] || [ "$credsBase64" = "TBD" ]
     then
+        _UpdateLoginPswdCheckHelper_ InitPWD
         Say "${REDct}**ERROR**${NOct}: No login credentials have been saved. Use the Main Menu to save login credentials."
         "$inMenuMode" && _WaitForEnterKey_ "$mainMenuReturnPromptStr"
         return 1
@@ -4245,9 +4402,11 @@ _GetNodeInfo_()
 
     if [ $? -ne 0 ]
     then
+        _UpdateLoginPswdCheckHelper_ FAILURE
         printf "\n${REDct}Login failed for AiMesh Node [$NodeIP_Address].${NOct}\n"
         return 1
     fi
+    _UpdateLoginPswdCheckHelper_ SUCCESS
 
     # Retrieve the HTML content #
     htmlContent="$(curl -s -k "${NodeURLstr}/appGet.cgi?hook=nvram_get(productid)%3bnvram_get(asus_device_list)%3bnvram_get(cfg_device_list)%3bnvram_get(firmver)%3bnvram_get(buildno)%3bnvram_get(extendno)%3bnvram_get(webs_state_flag)%3bnvram_get(odmpid)%3bnvram_get(wps_modelnum)%3bnvram_get(model)%3bnvram_get(build_name)%3bnvram_get(lan_hostname)%3bnvram_get(webs_state_info)%3bnvram_get(label_mac)" \
@@ -8064,7 +8223,7 @@ _RunOfflineUpdateNow_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Feb-15] ##
+## Modified by Martinski W. [2025-Mar-07] ##
 ##----------------------------------------##
 _RunFirmwareUpdateNow_()
 {
@@ -8229,6 +8388,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
     credsBase64="$(Get_Custom_Setting credentials_base64)"
     if [ -z "$credsBase64" ] || [ "$credsBase64" = "TBD" ]
     then
+        _UpdateLoginPswdCheckHelper_ InitPWD
         Say "${REDct}**ERROR**${NOct}: No login credentials have been saved. Use the Main Menu to save login credentials."
         "$inMenuMode" && _WaitForEnterKey_ "$theMenuReturnPromptMsg"
         return 1
@@ -8490,6 +8650,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
 
     if echo "$curl_response" | grep -Eq 'url=index\.asp|url=GameDashboard\.asp'
     then
+        _UpdateLoginPswdCheckHelper_ SUCCESS
         if [ -f /opt/bin/diversion ]
         then
             # Extract version number from Diversion
@@ -8608,6 +8769,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
         _ReleaseLock_
         /sbin/service reboot
     else
+         _UpdateLoginPswdCheckHelper_ FAILURE
         Say "${REDct}**ERROR**${NOct}: Router Login failed."
         if "$inMenuMode" || "$isInteractive"
         then
@@ -9830,7 +9992,7 @@ _ShowMainMenuOptions_()
    printf "\n${SEPstr}"
 
    printf "\n  ${GRNct}1${NOct}.  Run F/W Update Check Now\n"
-   printf "\n  ${GRNct}2${NOct}.  Set Router Login Credentials\n"
+   printf "\n  ${GRNct}2${NOct}.  Set Router Login Password\n"
 
    # Enable/Disable the ASUS Router's built-in "F/W Update Check" #
    FW_UpdateCheckState="$(nvram get firmware_check_enable)"
@@ -10521,9 +10683,14 @@ then
                            _ReleaseLock_ cliFileLock
                        fi
                        ;;
-                   "${SCRIPT_NAME}config")
+                   "${SCRIPT_NAME}config" | \
+                   "${SCRIPT_NAME}config_runLoginTest")
                        if _AcquireLock_ cliFileLock
                        then
+                           if [ "$3" = "${SCRIPT_NAME}config_runLoginTest" ]
+                           then runLoginCredentialsTest=true
+                           else runLoginCredentialsTest=false
+                           fi
                            _UpdateConfigFromWebUISettings_
                            _ConfirmCronJobForFWAutoUpdates_
                            _ReleaseLock_ cliFileLock
diff --git a/README.md b/README.md
index 37314254..6ab92e6e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
 ## v1.4.0
-## 2025-Mar-01
+## 2025-Mar-08
 
 ## WebUI:
 ![image](https://github.com/user-attachments/assets/10d0971c-b3c6-477a-8904-d4bf013f72df)