diff --git a/engine/client/cl_input.c b/engine/client/cl_input.c
index 8badbc63f..470953281 100644
--- a/engine/client/cl_input.c
+++ b/engine/client/cl_input.c
@@ -2294,7 +2294,7 @@ void CL_SendCmd (double frametime, qboolean mainloop)
 			{
 				if (cls.netchan.message.cursize + 2+strlen(clientcmdlist->command)+100 > cls.netchan.message.maxsize)
 					break;
-				if (!strncmp(clientcmdlist->command, "spawn", 5) && cls.userinfosync.numkeys)
+				if (!strncmp(clientcmdlist->command, "spawn", 5) && cls.userinfosync.numkeys && cl.haveserverinfo)
 					break;	//HACK: don't send the spawn until all pending userinfos have been flushed.
 				MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 				MSG_WriteString (&cls.netchan.message, clientcmdlist->command);
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 4a7329575..288d8c48c 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -777,7 +777,7 @@ void CL_CheckForResend (void)
 		connectinfo.istransfer = false;
 		connectinfo.adr.prot = NP_DGRAM;
 
-		NET_InitClient(true);
+		NET_InitClient(sv.state != ss_clustermode);
 
 		cls.state = ca_disconnected;
 		switch (svs.gametype)