diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js
index 8cd63c33562..5db9ccae465 100644
--- a/htdocs/lib/lib_head.js
+++ b/htdocs/lib/lib_head.js
@@ -522,7 +522,10 @@ function getIntegerInString(str,i,minlength,maxlength)
  * ==================================================================
  */
 function urlencode(s) {
-	return s.replace(/\+/gi,'%2B');
+	news=s;
+	news=news.replace(/\+/gi,'%2B');
+	news=news.replace(/&/gi,'%26');
+	return news;
 }