diff --git a/ReallifeGamemode.Client/assets/html/login/login.html b/ReallifeGamemode.Client/assets/html/login/login.html
index b7dab936..483cb8d0 100644
--- a/ReallifeGamemode.Client/assets/html/login/login.html
+++ b/ReallifeGamemode.Client/assets/html/login/login.html
@@ -19,19 +19,21 @@
 
         <p>Bitte gib dein Passwort ein:</p>
 
-        <div class="form">
-            <div class="form__row form__row--streched">
-                <div class="form__row">
-                    <input type="password" name="password" id="password">
-                    <span id="password-visibility" class="hidden"></span>
-                </div>
+        <form class="login">
+            <div class="form" role="form">
+                <div class="form__row form__row--streched">
+                    <div class="form__row">
+                        <input type="password" name="password" id="password">
+                        <span id="password-visibility" class="hidden"></span>
+                    </div>
 
-                <button type="submit" class="transparent" id="submit-login"></button>
+                    <button type="submit" class="transparent" id="submit-login"></button>
+                </div>
+                <div id="alert" class="hidden">
+                    Das Passwort kennen wir hier nicht.
+                </div>
             </div>
-            <div id="alert" class="hidden">
-                Das Passwort kennen wir hier nicht.
-            </div>
-        </div>
+        </form>
     </main>
 
     <footer>
diff --git a/ReallifeGamemode.Client/assets/html/login/register.html b/ReallifeGamemode.Client/assets/html/login/register.html
index e11b32bd..2b645ecd 100644
--- a/ReallifeGamemode.Client/assets/html/login/register.html
+++ b/ReallifeGamemode.Client/assets/html/login/register.html
@@ -24,19 +24,21 @@
             Passwort wählen:
         </p>
 
-        <div class="form">
-            <div class="form__row form__row--streched">
-                <div class="form__row">
-                    <input type="password" name="password" id="password">
-                    <span id="password-visibility" class="hidden"></span>
-                </div>
+        <form class="register">
+            <div class="form" role="form">
+                <div class="form__row form__row--streched">
+                    <div class="form__row">
+                        <input type="password" name="password" id="password">
+                        <span id="password-visibility" class="hidden"></span>
+                    </div>
 
-                <button type="submit" class="transparent" id="submit-register"></button>
+                    <button type="submit" class="transparent" id="submit-register"></button>
+                </div>
+                <div id="alert" class="hidden">
+                    Das Passwort kennen wir hier nicht.
+                </div>
             </div>
-            <div id="alert" class="hidden">
-                Das Passwort kennen wir hier nicht.
-            </div>
-        </div>
+        </form>
     </main>
 
     <footer>
diff --git a/ReallifeGamemode.Client/assets/js/login/application.js b/ReallifeGamemode.Client/assets/js/login/application.js
index f3774e2f..58715160 100644
--- a/ReallifeGamemode.Client/assets/js/login/application.js
+++ b/ReallifeGamemode.Client/assets/js/login/application.js
@@ -18,15 +18,8 @@ $(document).ready(function () {
         }
     }
 
-    $("#submit-login").click(function () {
-        mp.trigger("CEF:Login_LoginRequest", passwordField.val());
-    });
-
-
-    $("#submit-register").click(function () {
-        mp.trigger("CEF:Login_RegisterRequest", passwordField.val());
-    })
-
+    $('form.login').submit(function () { mp.trigger("CEF:Login_LoginRequest", passwordField.val()) });
+    $('form.registration').submit(function () { mp.trigger("CEF:Login_RegisterRequest", passwordField.val()) });
 });
 
 function setPlayerName(name) {