diff --git a/quakeworld/subs.qc b/quakeworld/subs.qc
index f985fcd..0c54da1 100644
--- a/quakeworld/subs.qc
+++ b/quakeworld/subs.qc
@@ -240,10 +240,11 @@ void() SUB_UseTargets =
 //
 	if (self.killtarget)
 	{
+		local string kt = self.killtarget;
 		t = world;
 		do
 		{
-			t = find (t, targetname, self.killtarget);
+			t = find (t, targetname, kt);
 			if (!t)
 				return;
 			remove (t);
diff --git a/quakeworld/triggers.qc b/quakeworld/triggers.qc
index f437e98..17332ac 100644
--- a/quakeworld/triggers.qc
+++ b/quakeworld/triggers.qc
@@ -511,9 +511,11 @@ void() trigger_onlyregistered_touch =
 	self.attack_finished = time + 2;
 	if (cvar("registered"))
 	{
+		local integer rem = self.targetname != self.killtarget;
 		self.message = "";
 		SUB_UseTargets ();
-		remove (self);
+		if (rem)
+			remove (self);
 	}
 	else
 	{