diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
index d70fab7be8..d2af263471 100644
--- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
+++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
@@ -1359,18 +1359,23 @@
             });
         };
 
+        function replaceAllWithSplit(str, find, replace) {
+
+            return str.split(find).join(replace);
+        }
+
         function cleanConnectPassword(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 = replaceAllWithSplit(password, "&", "&amp;");
+            password = replaceAllWithSplit(password, "/", "&#092;");
+            password = replaceAllWithSplit(password, "!", "&#33;");
+            password = replaceAllWithSplit(password, "$", "&#036;");
+            password = replaceAllWithSplit(password, "\"", "&quot;");
+            password = replaceAllWithSplit(password, "<", "&lt;");
+            password = replaceAllWithSplit(password, ">", "&gt;");
+            password = replaceAllWithSplit(password, "'", "&#39;");
 
             return password;
         }