diff --git a/Server/Events/Connect.cs b/Server/Events/Connect.cs
index 7a46fc9a..95135938 100644
--- a/Server/Events/Connect.cs
+++ b/Server/Events/Connect.cs
@@ -48,20 +48,6 @@ namespace reallife_gamemode.Server.Events
                 return;
             }
 
-            using (var loginUser = new DatabaseContext())
-            {
-                var user = loginUser.Users.SingleOrDefault(b => b.Name == player.Name);
-                if(user.Dead == true)
-                {
-                    player.TriggerEvent("startDeathTimer");
-                    player.SetData("isDead", true);
-                }
-                else
-                {
-                    player.SetData("isDead", false);
-                }
-            }
-
             player.SetData("isLoggedIn", false);
             player.Position = new Vector3(-1883.736, -781.4911, -10);
             player.FreezePosition = true;
diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs
index 64a5e8e0..e04e5d42 100644
--- a/Server/Events/Login.cs
+++ b/Server/Events/Login.cs
@@ -48,7 +48,17 @@ namespace reallife_gamemode.Server.Events
                         player.SetData("spec", true);
                         var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id);
                         userBankAccount.Balance = userBankAccount.Balance;
-                        player.TriggerEvent("draw", player.Name, player.Handle.Value);                       
+                        player.TriggerEvent("draw", player.Name, player.Handle.Value);
+
+                        if (user.Dead == true)
+                        {
+                            player.TriggerEvent("startDeathTimer");
+                            player.SetData("isDead", true);
+                        }
+                        else
+                        {
+                            player.SetData("isDead", false);
+                        }
                     }
                 }
             }