diff --git a/src/main/resources/static/js/music.js b/src/main/resources/static/js/music.js
index 995295b..b43098c 100644
--- a/src/main/resources/static/js/music.js
+++ b/src/main/resources/static/js/music.js
@@ -403,7 +403,7 @@ function search() {
     let list = $("#search_result");
     let load = $("#search_load");
     disableBtn($('#btn_search'));
-    disableBtn(input_search);
+    input_search.attr('disabled', 'disabled');
     list.removeClass("scale-in");
     load.removeClass("hide");
     load.addClass("scale-in");
@@ -434,7 +434,8 @@ function search() {
         load.addClass("hide");
         list.addClass("scale-in");
         enableBtn($('#btn_search'));
-        enableBtn(input_search);
+        input_search.removeAttr("disabled");
+        input_search.focus();
 
 
     }).fail( (data)=>{
diff --git a/src/main/resources/static/js/navabar.js b/src/main/resources/static/js/navabar.js
index 6c5fb29..434d67d 100644
--- a/src/main/resources/static/js/navabar.js
+++ b/src/main/resources/static/js/navabar.js
@@ -100,6 +100,7 @@ function disconnected() {
 
 
 function tryConnection() {
+
     var request = { name: input_name.val(), password: input_psw.val()};
     $.ajax({
         type: "POST",
@@ -175,7 +176,12 @@ function navListeners() {
     $('.nav-change-guild').click(function () {
         Cookies.remove('guild');
         window.location.reload(true);
-    })
+    });
+
+    $("#login_form").submit(function(e){
+        e.preventDefault();
+        tryConnection();
+    });
 }
 
 function getGuild(){
diff --git a/src/main/resources/templates/header.html b/src/main/resources/templates/header.html
index 61c0113..1660cd5 100644
--- a/src/main/resources/templates/header.html
+++ b/src/main/resources/templates/header.html
@@ -123,7 +123,7 @@
                 </div>
             </div>
             <div class="row center" style="margin-bottom: 0px">
-                <form name="login_form" id="login_form" action="javascript:void(0);" onsubmit="tryConnection()">
+                <form name="login_form" id="login_form">
                     <div class="row" style="margin-bottom: 0px">
                         <div class="input-field col l6 offset-l3 m10 offset-m1 s10 offset-s1">
                             <i class="material-icons prefix">account_box</i>