diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js
index 8a6fa4c828..50b21e84a0 100644
--- a/dashboard-ui/scripts/pluginspage.js
+++ b/dashboard-ui/scripts/pluginspage.js
@@ -10,7 +10,7 @@
 
         var promise1 = ApiClient.getInstalledPlugins();
 
-        var promise2 = ApiClient.getJSON("configurationpages?pageType=PluginConfiguration");
+        var promise2 = ApiClient.getJSON(ApiClient.getUrl("dashboard/configurationpages") + "?pageType=PluginConfiguration");
 
         $.when(promise1, promise2).done(function (response1, response2) {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 14fe062257..84241f602a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -121,11 +121,6 @@ var Dashboard = {
         return address;
     },
 
-    changeServer: function () {
-
-
-    },
-
     getCurrentUserId: function () {
 
         var autoLoginUserId = getParameterByName('u');
@@ -156,7 +151,10 @@ var Dashboard = {
 
     isConnectMode: function () {
 
-        return getWindowUrl().toLowerCase().indexOf('mediabrowser.tv') != -1;
+        var url = getWindowUrl().toLowerCase();
+
+        return url.indexOf('mediabrowser.tv') != -1 ||
+			url.indexOf('mediabrowser.github') != -1;
     },
 
     logout: function (logoutWithServer) {
@@ -556,6 +554,10 @@ var Dashboard = {
                 html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
             }
 
+            if (Dashboard.isConnectMode()) {
+                html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud">' + Globalize.translate('ButtonSelectServer') + '</button></a>';
+            }
+
             html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
 
             html += '</form>';
@@ -1178,7 +1180,7 @@ var Dashboard = {
 
     },
 
-    isServerlessPage: function() {
+    isServerlessPage: function () {
         var url = getWindowUrl().toLowerCase();
         return url.indexOf('connectlogin.html') != -1 || url.indexOf('selectserver.html') != -1;
     }
@@ -1234,7 +1236,7 @@ var Dashboard = {
     var appName = "Dashboard";
     var appVersion = window.dashboardVersion;
     var deviceName = generateDeviceName();
-    var deviceId = MediaBrowser.ApiClient.generateDeviceId();
+    var deviceId = MediaBrowser.generateDeviceId();
     var credentialProvider = new MediaBrowser.CredentialProvider();
 
     var capabilities = {
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 36da6369af..9b29839108 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -113,8 +113,9 @@
                 onSaveComplete(page, user);
             });
         } else {
-            ApiClient.createUser(user).done(function () {
-                onSaveComplete(page, user);
+            ApiClient.createUser(user).done(function (newUser) {
+                Dashboard.navigate("useredit.html?userId=" + newUser.Id);
+
             });
         }
     }
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index 2e376b2356..5b9405cf8d 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -4,7 +4,7 @@
     <title>${TitleMediaBrowser}</title>
 </head>
 <body>
-    <div id="selectServerPage" data-role="page" class="page libraryPage" data-theme="b">
+    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/thirdparty/apiclient/device.js b/dashboard-ui/thirdparty/apiclient/device.js
index d1fd2500b7..7886b2ce74 100644
--- a/dashboard-ui/thirdparty/apiclient/device.js
+++ b/dashboard-ui/thirdparty/apiclient/device.js
@@ -1,6 +1,10 @@
-﻿(function (store) {
+﻿if (!window.MediaBrowser) {
+    window.MediaBrowser = {};
+}
 
-    MediaBrowser.ApiClient.generateDeviceId = function () {
+(function (store) {
+
+    MediaBrowser.generateDeviceId = function () {
 
         var keys = [];
 
