Fix #405: expand current server as soon as you connect to it
Merge pull request #570 from stennie/issue-405

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