diff --git a/Client/Login/login.js b/Client/Login/login.js
index 8ef7bf0c..fa38798c 100644
--- a/Client/Login/login.js
+++ b/Client/Login/login.js
@@ -6,8 +6,8 @@
 
 function registerPlayer() {
    
-    var password = document.getElementById("passwordInputRegister");
-    var passwordRepeat = document.getElementById("passwordRepeatInputRegister");
+    var password = document.getElementById("passwordInputRegister").value;
+    var passwordRepeat = document.getElementById("passwordRepeatInputRegister").value;
 
     if(password === "" || passwordRepeat === "") {
         showError("Mindestens ein Passwort Feld ist leer!");
@@ -29,7 +29,7 @@ function registerPlayer() {
 
 function loginPlayer() {
     
-    let password = document.getElementById("passwordInputLogin");
+    let password = document.getElementById("passwordInputLogin").value;
 
     if (password === "") {
         showError("Du musst ein Passwort angeben!");
diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs
index ec749d05..0400150f 100644
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -17,7 +17,7 @@ namespace reallife_gamemode.Server.Events
         [RemoteEvent("OnPlayerLogin")]
         public void OnPlayerLogin(Client player, string password)
         {
-            var checkPassword = "";
+            string checkPassword = null;
             using (var loginContext = new Model.DatabaseContext())
             {
                 var user = loginContext.Users.SingleOrDefault(b => b.Name == player.Name);