diff --git a/public/js/form-validation.js b/public/js/form-validation.js
new file mode 100644
index 00000000..9df36e6e
--- /dev/null
+++ b/public/js/form-validation.js
@@ -0,0 +1,19 @@
+/* global showLoader */
+
+// Form validation for GitHub username search
+document.getElementById('search-form').onsubmit = function() {
+    const inputField = document.getElementById('username');
+    // Auto-remove all spaces from the username
+    const username = inputField.value.replace(/\s/g, '');
+
+    if (username === '') {
+        alert('Username cannot be empty.');
+        return false; // Prevent form submission
+    }
+
+    // Update the input field with the cleaned value
+    inputField.value = username;
+
+    showLoader();
+    return true; // Allow form submission
+};
diff --git a/src/pages/partials/body.handlebars b/src/pages/partials/body.handlebars
index 004186c3..daa35ad7 100644
--- a/src/pages/partials/body.handlebars
+++ b/src/pages/partials/body.handlebars
@@ -10,11 +10,11 @@
     <div class="container">
       <div class="row">
         <div class="order-md-2 col-md-6">
-          <form id="search-form" action="" method="get" action="#">
+          <form id="search-form" method="get" action="#">
             <div class="input-group">
-              <input type="text" class="form-control" autofocus="autofocus" id="username" name="username" placeholder="Github username"
+              <input type="text" class="form-control" autofocus="autofocus" id="username" name="username" placeholder="GitHub username"
                 required title="Username cannot be empty or contain only spaces" maxlength="39">
-              <button type="submit" class="input-group-addon btn" name="" onClick="return validateInput();">
+              <button type="submit" class="btn" name="" aria-label="Search GitHub user">
                 <i class="fa fa-search"></i>
               </button>
             </div>
@@ -101,17 +101,6 @@
 </center>
 
 <script src="public/js/spinner.js"></script>
+<script src="public/js/form-validation.js"></script>
 <div id="fb-root"></div>
 <script src="public/js/social.js"></script>
-
-<script>
-  function validateInput() {
-    const inputField = document.getElementById("username");
-    if (/\s/.test(inputField.value)) {
-      alert("Username cannot contain any spaces.");
-      return false;
-    }
-    showLoader();
-    return true;
-  }
-</script>