diff --git a/BUGS b/BUGS
index e036db9..d0c79e5 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,3 @@
-- that the suicide message, and some others, used the original nick even though he changed it
 - info string length exceeded :/
 - still get teamkill curse with teamplay 0
 - duplicate connects
diff --git a/client.qc b/client.qc
index 730363b..0af649d 100644
--- a/client.qc
+++ b/client.qc
@@ -3015,6 +3015,7 @@ void() PlayerPostThink =
 				sound (self, #CHAN_VOICE, "player/land.wav", 1, #ATTN_NORM);
 	}
 
+	self.netname = infokey(self, "name");
 
 	self.jump_flag = self.velocity_z;
 
diff --git a/custom.qc b/custom.qc
index b76c85f..43b9fe6 100644
--- a/custom.qc
+++ b/custom.qc
@@ -1319,6 +1319,7 @@ void(entity bastard,float threshold) createBastard =
 
 	bastard.penance_time = time + 60;
 	stuffcmd(bastard, "name \"ΤεανΛιμμες (");
+//	stuffcmd(bartard, "name \"\<TeamKiller\> (");
 	stuffcmd(bastard, bastard.netname);
 	stuffcmd(bastard, ")\"\n");