diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 274e89851..d9f1fcff0 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -260,6 +260,9 @@ $tmp =~ s/>/>/g;
 $tmp =~ s/\"/"/g;
 $tmp =~ s/\'/'/g;
 $tmp =~ s/=/=/g;
+# Never escape spaces
+$tmp =~ s/ / /g;
+$tmp =~ s/ / /g;
 return $tmp;
 }