Fixed bug #1816 - the timeout updating logic should have been in a before_save handle...