diff --git a/ui/commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js b/ui/commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
index dee4756e96..116b0ae5d4 100644
--- a/ui/commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
+++ b/ui/commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 define([
@@ -103,7 +104,7 @@ define([
 
         showMessage: function() {
             var _this = this,
-                alertClass = "alert-info",
+                alertClass,
                 alertIcon = "alert-message-icon",
                 delay = _this.delay + (this.list[0].message.length * 20);
 
diff --git a/ui/commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js b/ui/commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
index 247b6a0c7c..c85c17fbd3 100644
--- a/ui/commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
+++ b/ui/commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 define([
@@ -118,7 +119,7 @@ define([
         var cDialog = obj.currentDialog, cDialogArgs = obj.currentDialogArgs;
 
         obj.changeView(obj.currentView, obj.currentViewArgs, function() {}, true);
-        if (cDialog && cDialog !== null) {
+        if (cDialog) {
             obj.showDialog(cDialog, cDialogArgs);
         }
     };
diff --git a/ui/commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js b/ui/commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
index 7bdde17ecd..0d9f53d7fe 100644
--- a/ui/commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
+++ b/ui/commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
@@ -637,7 +637,7 @@ define([
          * @returns {Boolean}
          */
         "isUrl": function(string){
-            var regexp = /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
+            var regexp = /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@\-\/]))?/;
             return regexp.test(string);
         }
 
diff --git a/ui/commons/src/main/resources/templates/common/LoginTemplate.html b/ui/commons/src/main/resources/templates/common/LoginTemplate.html
index ac8ef0701c..84813ae9e4 100644
--- a/ui/commons/src/main/resources/templates/common/LoginTemplate.html
+++ b/ui/commons/src/main/resources/templates/common/LoginTemplate.html
@@ -1,4 +1,5 @@
 <!-- Copyright 2016 ForgeRock AS.
+	Portions Copyrighted 2026 3A Systems, LLC
 	License terms: https://forgerock.org/cddlv1-0/ -->
 <div class="container">
     <div class="row">
@@ -24,7 +25,7 @@
                     <div class="remember-forgot clearfix">
                         <div class="checkbox pull-left">
                             <label>
-                                <input type="checkbox" type="checkbox" name="loginRemember"> {{t "templates.user.LoginTemplate.loginRemember"}}
+                                <input type="checkbox" name="loginRemember"> {{t "templates.user.LoginTemplate.loginRemember"}}
                             </label>
                         </div>
                     </div>
diff --git a/ui/user/src/main/js/org/forgerock/commons/ui/user/profile/UserProfileKBATab.js b/ui/user/src/main/js/org/forgerock/commons/ui/user/profile/UserProfileKBATab.js
index e8da32af23..994d5e3edc 100644
--- a/ui/user/src/main/js/org/forgerock/commons/ui/user/profile/UserProfileKBATab.js
+++ b/ui/user/src/main/js/org/forgerock/commons/ui/user/profile/UserProfileKBATab.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 define([
@@ -127,7 +128,7 @@ define([
             }
 
             // validate form only in case security question was selected
-            if (!isKbaQuestion || (isKbaQuestion && (target.val() !== ""))) {
+            if (!isKbaQuestion || target.val() !== "") {
                 ValidatorsManager.bindValidators(form, Configuration.loggedUser.baseEntity, function () {
                     ValidatorsManager.validateAllFields(form);
                 });