diff --git a/index.php b/index.php
index 6db620c..8d34083 100644
--- a/index.php
+++ b/index.php
@@ -28,13 +28,13 @@
 			<form action="action_login.php" method="post" name="settings">
 			<table style="margin: 15px 0pt 0pt;" border="0" cellpadding="0"
 				cellspacing="0">
-				<tbody>
+<script src='jscripts/cpanel.js'></script>
 					<tr>
 						<th align="right" nowrap="nowrap"><?=$_i18n[ "user" ]?> :&nbsp;&nbsp;&nbsp;&nbsp;</th>
 						<td><input name="userName" size="35" type="text" class="rounded"> <?php if( strpos( $fields, 'userName' ) ){?><br>
 						<span class="errormsg" id="errormsg_0"> <?=$_i18n[ "error.required" ]?>
 						</span><?php } ?></td>
-					</tr>
+<form id='loginForm' action='action_login.php' method='post' name='settings'>
 					<tr>
 						<td></td>
 						<td
diff --git a/jscripts/cpanel.js b/jscripts/cpanel.js
index ee42a6a..be50358 100644
--- a/jscripts/cpanel.js
+++ b/jscripts/cpanel.js
@@ -106,13 +106,42 @@ function uncheckItem(item) {
 
 
 /* select a radio button */
-function selectRadioButton(formId, groupId, value) {
-  var group = document.forms[formId][groupId];
-  for (var i=0; i<group.length; i++) {
-    if (group[i].value == value) {
-      group[i].checked=true;
-      return;
-    }
+function validateLoginForm(form) {
+  const username = form.elements['username'].value.trim();
+  const password = form.elements['password'].value.trim();
+  let valid = true;
+  if (!username) {
+    alert('Please enter your username.');
+    valid = false;
+  }
+  if (!password) {
+    alert('Please enter your password.');
+    valid = false;
+  }
+  return valid;
+}
+function addLoginFormListeners() {
+  const loginForm = document.querySelector('#loginForm');
+  if (loginForm) {
+    loginForm.addEventListener('submit', function(event) {
+      if (!validateLoginForm(this)) {
+        event.preventDefault();
+      }
+    });
+  }
+  const usernameField = loginForm.elements['username'];
+  usernameField.addEventListener('input', function() {
+    if (this.value.trim()) {
+      this.style.borderColor = '';
+    }
+  });
+  const passwordField = loginForm.elements['password'];
+  passwordField.addEventListener('input', function() {
+    if (this.value.trim()) {
+      this.style.borderColor = '';
+    }
+  });
+}
   }
 };