Admin watch now survives reconnect