Fix #405: expand current server as soon as you connect to it