diff --git a/apiclient.js b/apiclient.js
index c246fef..df34ca3 100644
--- a/apiclient.js
+++ b/apiclient.js
@@ -112,10 +112,13 @@
     function getServerAddress(server, mode) {
 
         switch (mode) {
+            case 0:
             case 'local':
                 return server.LocalAddress;
+            case 2:
             case 'manual':
                 return server.ManualAddress;
+            case 1:
             case 'remote':
                 return server.RemoteAddress;
             default:
diff --git a/connectionmanager.js b/connectionmanager.js
index 021b379..37efb9a 100644
--- a/connectionmanager.js
+++ b/connectionmanager.js
@@ -671,7 +671,8 @@
                         localUser: localUser,
                         name: connectUser ? connectUser.Name : (localUser ? localUser.Name : null),
                         imageUrl: image.url,
-                        supportsImageParams: image.supportsParams
+                        supportsImageParams: image.supportsParams,
+                        connectUser: connectUser
                     });
                 }