diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 75b40c6f..8125c775 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -252,6 +252,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
             d->lifesequence = ls;
             d->gunselect = gunselect;
             d->state = CS_ALIVE;
+            d->lastupdate = 0;
             break;
         }
 
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 3caed680..d7ce313c 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1440,7 +1440,7 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
         }
 
         case SV_TRYSPAWN:
-            if(cl->state.state!=CS_DEAD || ci->state.lastspawn>=0 || !canspawn(cl)) break;
+            if(cl->state.state!=CS_DEAD || cl->state.lastspawn>=0 || !canspawn(cl)) break;
             if(cl->state.lastdeath) cl->state.respawn();
             sendspawn(cl);
             break;