diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 87bed7d3f6..fa5e1ee87f 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -731,13 +731,12 @@
                 type: "POST",
                 url: "https://connect.mediabrowser.tv/service/user/authenticate",
                 data: {
-                    userName: username,
+                    nameOrEmail: username,
                     password: md5
                 },
                 dataType: "json",
                 contentType: 'application/x-www-form-urlencoded; charset=UTF-8'
 
-
             }).done(function (result) {
 
                 var credentials = credentialProvider.credentials();
@@ -751,25 +750,9 @@
             });
         };
 
-        function replaceAll(str, find, replace) {
-
-            return str.split(find).join(replace);
-
-            //return str.replace(new RegExp(find, 'g'), replace);
-        }
-
         self.getConnectPasswordHash = function (password) {
 
-            password = password || '';
-
-            password = replaceAll(password, "&", "&");
-            password = replaceAll(password, "/", "\");
-            password = replaceAll(password, "!", "!");
-            password = replaceAll(password, "$", "$");
-            password = replaceAll(password, "\"", """);
-            password = replaceAll(password, "<", "&lt;");
-            password = replaceAll(password, ">", "&gt;");
-            password = replaceAll(password, "'", "&#39;");
+            password = globalScope.MediaBrowser.ConnectService.cleanPassword(password);
 
             return CryptoJS.MD5(password).toString();
         };
@@ -820,9 +803,9 @@
             });
         };
 
-        self.acceptServer = function (authorizationId) {
+        self.acceptServer = function (serverId) {
 
-            var url = "https://connect.mediabrowser.tv/service/ServerAuthorizations/accept?id=" + authorizationId;
+            var url = "https://connect.mediabrowser.tv/service/ServerAuthorizations/accept?serverId=" + serverId + "&userId=" + self.connectUserId();
 
             return $.ajax({
                 type: "GET",
diff --git a/dashboard-ui/thirdparty/apiclient/connectservice.js b/dashboard-ui/thirdparty/apiclient/connectservice.js
new file mode 100644
index 0000000000..e27ff5e2b8
--- /dev/null
+++ b/dashboard-ui/thirdparty/apiclient/connectservice.js
@@ -0,0 +1,34 @@
+(function (globalScope) {
+
+    if (!globalScope.MediaBrowser) {
+        globalScope.MediaBrowser = {};
+    }
+
+    function replaceAll(str, find, replace) {
+
+        return str.split(find).join(replace);
+    }
+
+    var connectService = {
+
+        cleanPassword: function (password) {
+
+            password = password || '';
+
+            password = replaceAll(password, "&", "&amp;");
+            password = replaceAll(password, "/", "&#092;");
+            password = replaceAll(password, "!", "&#33;");
+            password = replaceAll(password, "$", "&#036;");
+            password = replaceAll(password, "\"", "&quot;");
+            password = replaceAll(password, "<", "&lt;");
+            password = replaceAll(password, ">", "&gt;");
+            password = replaceAll(password, "'", "&#39;");
+
+            return password;
+        }
+
+    };
+
+    globalScope.MediaBrowser.ConnectService = connectService;
+
+})(window);
\ No newline at end of file