--- a/hedgewars/uTeams.pas	Wed Jul 02 23:55:00 2014 +0400
+++ b/hedgewars/uTeams.pas	Fri Jul 04 22:45:59 2014 +0400
@@ -704,12 +704,13 @@
                 AddChatString('** '+ TeamName + ' is back');
                 if not CurrentTeam^.ExtDriven then SendIPC(_S'g' + s);
                 hasGone:= false;
-                isGoneFlagPengingToBeUnset:= false;
 
                 RecountTeamHealth(TeamsArray[t]);
 
-                if Owner = UserNick then
-                    ExtDriven:= false
+                if isGoneFlagPengingToBeUnset and (Owner = UserNick) then
+                    ExtDriven:= false;
+
+                isGoneFlagPengingToBeUnset:= false;
                 end;
         end
     else