diff --git a/Server/Events/Disconnect.cs b/Server/Events/Disconnect.cs
index e740aec5..d923476f 100644
--- a/Server/Events/Disconnect.cs
+++ b/Server/Events/Disconnect.cs
@@ -35,7 +35,7 @@ namespace reallife_gamemode.Server.Events
 
             using (var saveUser = new Model.DatabaseContext())
             {
-                var user = saveUser.Users.SingleOrDefault(u => u.Name == player.Name);
+                var user = player.GetUser(saveUser);
 
                 if(user == null)
                 {
diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs
index 55aedcbb..293d598f 100644
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -42,7 +42,7 @@ namespace reallife_gamemode.Server.Events
                     else 
                     {
                         player.TriggerEvent("loginSuccess");                       
-                        NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
+                        NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0);
 
                         player.SetData("isLoggedIn", true);
                         player.SetData("spec", true);