Changed serverConnect semantics for changing servers manually

If you manually specify a server and then connect with the default
server it uses the default on disk and not the previous server