diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js
index 0539ca1fb..ef070854e 100644
--- a/dashboard-ui/apiclient/connectionmanager.js
+++ b/dashboard-ui/apiclient/connectionmanager.js
@@ -1232,56 +1232,43 @@
 
         self.deleteServer = function (serverId) {
 
-            var credentials = credentialProvider.credentials();
+            var connectToken = self.connectToken();
 
-            var serverInfo = credentials.Servers = credentials.Servers.filter(function (s) {
-                return s.ConnectServerId == serverId;
-            });
+            if (!serverId) {
+                throw new Error("null serverId");
+            }
+
+            var deferred = DeferredBuilder.Deferred();
 
             function onDone() {
-
-                credentials = credentialProvider.credentials();
+                var credentials = credentialProvider.credentials();
 
                 credentials.Servers = credentials.Servers.filter(function (s) {
                     return s.ConnectServerId != serverId;
                 });
 
                 credentialProvider.credentials(credentials);
+                deferred.resolve();
             }
 
-            if (serverInfo.ExchangeToken) {
-
-                var connectToken = self.connectToken();
-
-                if (!serverId) {
-                    throw new Error("null serverId");
-                }
-                if (!connectToken) {
-                    throw new Error("null connectToken");
-                }
-                if (!self.connectUserId()) {
-                    throw new Error("null connectUserId");
-                }
-
-                var url = "https://connect.mediabrowser.tv/service/serverAuthorizations?serverId=" + serverId + "&userId=" + self.connectUserId();
-
-                return HttpClient.send({
-                    type: "DELETE",
-                    url: url,
-                    headers: {
-                        "X-Connect-UserToken": connectToken,
-                        "X-Application": appName + "/" + appVersion
-                    }
-
-                }).always(onDone);
-
-            } else {
-
+            if (!connectToken || !self.connectUserId()) {
                 onDone();
-                var deferred = DeferredBuilder.Deferred();
-                deferred.resolve();
                 return deferred.promise();
             }
+
+            var url = "https://connect.mediabrowser.tv/service/serverAuthorizations?serverId=" + serverId + "&userId=" + self.connectUserId();
+
+            HttpClient.send({
+                type: "DELETE",
+                url: url,
+                headers: {
+                    "X-Connect-UserToken": connectToken,
+                    "X-Application": appName + "/" + appVersion
+                }
+
+            }).always(onDone);
+
+            return deferred.promise();
         };
 
         self.rejectServer = function (serverId) {
diff --git a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
index 1f0548f3d..9ae5e84c7 100644
--- a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
+++ b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
@@ -27,14 +27,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-resizable-behavior",
+  "homepage": "https://github.com/PolymerElements/iron-resizable-behavior",
   "_release": "1.0.2",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.2",
     "commit": "85de8ba28be2bf17c81d6436ef1119022b003674"
   },
-  "_source": "git://github.com/polymerelements/iron-resizable-behavior.git",
+  "_source": "git://github.com/PolymerElements/iron-resizable-behavior.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-resizable-behavior"
+  "_originalSource": "PolymerElements/iron-resizable-behavior"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index 19c540313..cf1fd9aef 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -1,7 +1,6 @@
 (function () {
 
-	var serverList = [];
-	function connectToServer(page, server) {
+    function connectToServer(page, server) {
 
         Dashboard.showLoadingMsg();
 
@@ -110,8 +109,6 @@
 
     function renderServers(page, servers) {
 
-    	serverList = servers;
-
         if (servers.length) {
             $('.noServersMessage', page).hide();
         } else {
@@ -182,12 +179,7 @@
 
             Dashboard.hideModalLoadingMsg();
 
-            // Just re-render the servers without discovering them again
-            // If we re-discover then the one they deleted may just come back
-            var newServerList = serverList.filter(function(s){
-            	return s.Id != id;
-            });
-            renderServers(page, newServerList);
+            loadPage(page);
 
         }).fail(function () {