diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py
index c2d3c8ca..6fad39b9 100644
--- a/jellyfin_kodi/connect.py
+++ b/jellyfin_kodi/connect.py
@@ -112,8 +112,7 @@ class Connect(object):
                 return state['Credentials']
 
             elif (server_selection or state['State'] == CONNECTION_STATE['ServerSelection'] or state['State'] == CONNECTION_STATE['Unavailable'] and not settings('SyncInstallRunDone.bool')):
-
-                self.select_servers(state)
+                state['Credentials']['Servers'] = [self.select_servers(state)]
 
             elif state['State'] == CONNECTION_STATE['ServerSignIn']:
                 if 'ExchangeToken' not in state['Servers'][0]:
@@ -170,12 +169,12 @@ class Connect(object):
 
         if dialog.is_server_selected():
             LOG.debug("Server selected: %s", dialog.get_server())
-            return
+            return dialog.get_server()
 
         elif dialog.is_manual_server():
             LOG.debug("Adding manual server")
             try:
-                self.manual_server()
+                return self.manual_server()
             except RuntimeError:
                 pass
         else:
diff --git a/resources/skins/default/1080i/script-jellyfin-connect-server.xml b/resources/skins/default/1080i/script-jellyfin-connect-server.xml
index fd3de8c8..c09e86e0 100644
--- a/resources/skins/default/1080i/script-jellyfin-connect-server.xml
+++ b/resources/skins/default/1080i/script-jellyfin-connect-server.xml
@@ -75,7 +75,7 @@
 								<onup>noop</onup>
 								<onleft>close</onleft>
 								<onright>close</onright>
-								<ondown>205</ondown>
+								<ondown>206</ondown>
 								<itemlayout width="510" height="65">
 									<control type="group">
 										<left>20</left>