diff --git a/ReallifeGamemode.Client/assets/html/login/login.html b/ReallifeGamemode.Client/assets/html/login/login.html
index a566ea86..4a47656e 100644
--- a/ReallifeGamemode.Client/assets/html/login/login.html
+++ b/ReallifeGamemode.Client/assets/html/login/login.html
@@ -23,7 +23,7 @@
             <div class="form" role="form">
                 <div class="form__row form__row--streched">
                     <div class="form__row">
-                        <input type="password" name="password" id="password">
+                        <input type="password" name="password" id="password" autofocus>
                         <span id="password-visibility" class="hidden"></span>
                     </div>
 
diff --git a/ReallifeGamemode.Client/assets/html/login/register.html b/ReallifeGamemode.Client/assets/html/login/register.html
index e9af646d..81239c8d 100644
--- a/ReallifeGamemode.Client/assets/html/login/register.html
+++ b/ReallifeGamemode.Client/assets/html/login/register.html
@@ -28,7 +28,7 @@
             <div class="form" role="form">
                 <div class="form__row form__row--streched">
                     <div class="form__row">
-                        <input type="password" name="password" id="password">
+                        <input type="password" name="password" id="password" autofocus>
                         <span id="password-visibility" class="hidden"></span>
                     </div>
 
diff --git a/ReallifeGamemode.Client/assets/js/login/application.js b/ReallifeGamemode.Client/assets/js/login/application.js
index 3e0e4977..622107f8 100644
--- a/ReallifeGamemode.Client/assets/js/login/application.js
+++ b/ReallifeGamemode.Client/assets/js/login/application.js
@@ -18,8 +18,15 @@ $(document).ready(function () {
         }
     }
 
-    $('form.login').submit(function () { mp.trigger("CEF:Login_LoginRequest", passwordField.val()) });
-    $('form.register').submit(function () { mp.trigger("CEF:Login_RegisterRequest", passwordField.val()) });
+    $('form.login').submit(function (e) {
+        e.preventDefault();
+        mp.trigger("CEF:Login_LoginRequest", passwordField.val())
+    });
+
+    $('form.register').submit(function (e) {
+        e.preventDefault();
+        mp.trigger("CEF:Login_RegisterRequest", passwordField.val())
+    });
 });
 
 function setPlayerName(name) {