Tidy up new server dialog linker.
Merge pull request #147 from greboid/newserverdialog

Tidy up the new server dialog linker.