Move the reconnect hook-up to as soon as a new client is created and not only after the new client connects (@jerith, @hodgestar).