diff --git a/chooser.cgi b/chooser.cgi
index 182aee08c..54a2a8636 100755
--- a/chooser.cgi
+++ b/chooser.cgi
@@ -186,10 +186,10 @@ EOF
 
 		if ($f eq "..") {
 			$dir =~ /^(.*\/)[^\/]+\/$/;
-			$link = "<a href=\"\" onClick='parentdir(\"".quotemeta($1)."\"); return false'>";
+			$link = "<a href=\"\" onClick='parentdir(\"".&quote_javascript($1)."\"); return false'>";
 			}
 		else {
-			$link = "<a href=\"\" onClick='fileclick(\"".quotemeta("$dir$f")."\", $isdir); return false'>";
+			$link = "<a href=\"\" onClick='fileclick(\"".&quote_javascript("$dir$f")."\", $isdir); return false'>";
 			}
 		local @cols;
 		push(@cols, "$link<img border=0 src=$gconfig{'webprefix'}/images/$icon></a>");
diff --git a/group_chooser.cgi b/group_chooser.cgi
index dc39650a7..f0d240962 100755
--- a/group_chooser.cgi
+++ b/group_chooser.cgi
@@ -31,7 +31,7 @@ if ($in{'multi'}) {
 		print "selr = new Array($len);\n";
 		for($i=0; $i<$len; $i++) {
 			print "sel[$i] = \"".
-			      quotemeta($ul[$i])."\";\n";
+			      &quote_javascript($ul[$i])."\";\n";
 
 			# samba valid system group can start with @ + &
 			$gn = $ul[$i];
@@ -44,7 +44,7 @@ if ($in{'multi'}) {
 						 @{$members{$ginfo[2]}} );
 				if (@mems > 3) { @mems = (@mems[0..1], "..."); }
 				print "selr[$i] = \"",
-				  quotemeta(join(' ', @mems)),"\";\n";
+				  &quote_javascript(join(' ', @mems)),"\";\n";
 				}
 			else { print "selr[$i] = \"???\";\n"; }
 			}
diff --git a/user_chooser.cgi b/user_chooser.cgi
index 4fe59649e..abc707abd 100755
--- a/user_chooser.cgi
+++ b/user_chooser.cgi
@@ -24,7 +24,7 @@ if ($in{'multi'}) {
 		print "selr = new Array($len);\n";
 		for($i=0; $i<$len; $i++) {
 			print "sel[$i] = \"".
-			      quotemeta($ul[$i])."\";\n";
+			      &quote_javascript($ul[$i])."\";\n";
             
 			# samba valid system user can start with @ + &
 			$gn = $ul[$i];
@@ -32,7 +32,7 @@ if ($in{'multi'}) {
 			@uinfo = getpwnam($gn);
 			if (@uinfo) {
 				print "selr[$i] = \"".
-				      quotemeta($uinfo[6])."\";\n";
+				      &quote_javascript($uinfo[6])."\";\n";
 				}
 			else {
 				print "selr[$i] = \"???\";\n";