If somebody gets booted and come back, he gets back his full boot time, also when he had less than that before his last move, where he was booted. That should be changed to the boottime he had been before.

At the cost of a boot I'd say it's worth it :)