diff --git a/mozilla/webtools/addons/public/htdocs/js/auth.js b/mozilla/webtools/addons/public/htdocs/js/auth.js
index 46c469c485c..a114fffe06e 100644
--- a/mozilla/webtools/addons/public/htdocs/js/auth.js
+++ b/mozilla/webtools/addons/public/htdocs/js/auth.js
@@ -31,5 +31,5 @@ function readCookie(name)
 /* Someone should make this a js builtin */
 function htmlEntities(str)
 {
-    return str.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;').replace('"','&quot;').replace('+','&nbsp;');
+    return str.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/\+/g,'&nbsp;');
 }