diff --git a/chooser.cgi b/chooser.cgi
index 3d6da9de7..182aee08c 100755
--- a/chooser.cgi
+++ b/chooser.cgi
@@ -16,7 +16,6 @@ use WebminCore;
 		"tar", "binary.gif"
 		);
 
-$trust_unknown_referers = 1;
 &init_config();
 if (&get_product_name() eq 'usermin') {
 	&switch_to_remote_user();
diff --git a/date_chooser.cgi b/date_chooser.cgi
index 2f783b2c0..38c0f0cfb 100755
--- a/date_chooser.cgi
+++ b/date_chooser.cgi
@@ -6,7 +6,6 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 use Time::Local;
 
-$trust_unknown_referers = 1;
 &init_config();
 &ReadParse();
 
diff --git a/group_chooser.cgi b/group_chooser.cgi
index 95dc1183b..dc39650a7 100755
--- a/group_chooser.cgi
+++ b/group_chooser.cgi
@@ -5,7 +5,6 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 
-$trust_unknown_referers = 1;
 &init_config();
 if (&get_product_name() eq 'usermin') {
 	&switch_to_remote_user();
@@ -26,7 +25,7 @@ if ($in{'multi'}) {
 		# base frame
 		&PrintHeader();
 		print "<script type='text/javascript'>\n";
-		@ul = &split_quoted($in{'group'});
+		@ul = &split_quoted(&filter_javascript($in{'group'}));
 		$len = @ul;
 		print "sel = new Array($len);\n";
 		print "selr = new Array($len);\n";
diff --git a/help.cgi b/help.cgi
index eaaeace65..65abe60d1 100755
--- a/help.cgi
+++ b/help.cgi
@@ -5,7 +5,6 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 
-$trust_unknown_referers = 1;
 &init_config();
 &error_setup($text{'help_err'});
 $ENV{'PATH_INFO'} !~ /[\\\&\;\`\'\"\|\*\?\~\<\>\^\(\)\[\]\{\}\$\n\r]/ ||
diff --git a/module_chooser.cgi b/module_chooser.cgi
index 66060e647..a135fcf81 100755
--- a/module_chooser.cgi
+++ b/module_chooser.cgi
@@ -4,7 +4,6 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 
-$trust_unknown_referers = 1;
 &init_config();
 &ReadParse(undef, undef, 2);
 %access = &get_module_acl();
diff --git a/uptracker.cgi b/uptracker.cgi
index f9f259393..3e606e940 100755
--- a/uptracker.cgi
+++ b/uptracker.cgi
@@ -4,7 +4,6 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 
-$trust_unknown_referers = 1;
 &init_config();
 &ReadParse();
 $id = $in{'id'};
diff --git a/user_chooser.cgi b/user_chooser.cgi
index 0a4257880..4fe59649e 100755
--- a/user_chooser.cgi
+++ b/user_chooser.cgi
@@ -5,7 +5,6 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 
-$trust_unknown_referers = 1;
 &init_config();
 if (&get_product_name() eq 'usermin') {
 	&switch_to_remote_user();
@@ -19,7 +18,7 @@ if ($in{'multi'}) {
 		# base frame
 		&PrintHeader();
 		print "<script type='text/javascript'>\n";
-		@ul = split(/\s+/, $in{'user'});
+		@ul = split(/\s+/, &filter_javascript($in{'user'}));
 		$len = @ul;
 		print "sel = new Array($len);\n";
 		print "selr = new Array($len);\n";
@@ -31,8 +30,6 @@ if ($in{'multi'}) {
 			$gn = $ul[$i];
 			$gn =~ s/^(@|\+|&)+//g;
 			@uinfo = getpwnam($gn);
-
-			#@uinfo = getpwnam($ul[$i]);
 			if (@uinfo) {
 				print "selr[$i] = \"".
 				      quotemeta($uinfo[6])."\";\n";