diff --git a/quakec/fallout2/client.qc b/quakec/fallout2/client.qc
index 3a2fb6658..02a945cd7 100644
--- a/quakec/fallout2/client.qc
+++ b/quakec/fallout2/client.qc
@@ -483,6 +483,19 @@ void() PutClientInServer =
 {
 	local   entity spot;
 
+	if (self.class == 0 || self.team == 0)
+	{
+		setsize (self, VEC_HULL_MIN, VEC_HULL_MAX);
+		self.view_ofs = '0 0 22';
+		self.takedamage = DAMAGE_NO;
+		self.solid = SOLID_NOT;
+		spot = SelectSpawnPoint ();
+		self.origin = spot.origin + '0 0 1';
+		self.angles = spot.angles;
+		self.fixangle = TRUE;           // turn this way immediately
+
+		return;
+	}
 	self.classname = "player";
 	self.health = 100;
 	self.takedamage = DAMAGE_AIM;
@@ -1272,6 +1285,7 @@ void() PlayerPreThink =
 			self.regen = self.regen - 1;
 		}
 
+		stuffcmd(self, "v_idlescale 0\n");
 		self.cycle2 = time + 1;
 	}
 
diff --git a/quakec/fallout2/combat.qc b/quakec/fallout2/combat.qc
index 212b01757..5b6b097c7 100644
--- a/quakec/fallout2/combat.qc
+++ b/quakec/fallout2/combat.qc
@@ -179,6 +179,7 @@ void(entity targ, entity inflictor, entity attacker, float damage) T_Damage =
 	{
 		damage = 0;
 		sound (targ, CHAN_BODY, targ.armornoise, 1, ATTN_NORM);
+		return;
 	}
 
 	if (random()*4<=1)