Fix client connection bug, properly stash server name