diff --git a/Source/Server/Spawn.c b/Source/Server/Spawn.c
index 27d203a0..f550738b 100644
--- a/Source/Server/Spawn.c
+++ b/Source/Server/Spawn.c
@@ -193,6 +193,11 @@ void CSEv_GamePlayerSpawn_f( float fChar ) {
 		}
 	}
 	
+	self.fSlotMelee = 0;
+	self.fSlotPrimary = 0;
+	self.fSlotSecondary = 0;
+	self.fSlotGrenade = 0;
+	
 	// Spawn the players immediately when its in the freeze state
 	switch ( fGameState ) {
 		case GAME_FREEZE:
diff --git a/opencs/progs.dat b/opencs/progs.dat
index 3600e87b..a1d875a4 100644
Binary files a/opencs/progs.dat and b/opencs/progs.dat differ