diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 66bb6aa8..89cf049c 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -252,8 +252,8 @@ function CreateServerGroup()
                 dialog = createObject("roSGNode", "ProgressDialog")
                 dialog.title = tr("Connecting to Server")
                 m.scene.dialog = dialog
-
                 serverUrl = inferServerUrl(screen.serverUrl)
+                if serverUrl = invalid then serverUrl = ""
                 'If this is a different server from what we know, reset username/password setting
                 if m.global.session.server.url <> serverUrl
                     set_setting("username", "")