diff --git a/custom/CHANGELOG b/custom/CHANGELOG
index 063edfbb1..36fe04c64 100644
--- a/custom/CHANGELOG
+++ b/custom/CHANGELOG
@@ -27,3 +27,5 @@ Added a parameter-level option to make the parameter mandatory.
 ---- Changes since 1.500 ----
 Added a button to clone an existing command when editing.
 The sort order of commands can now be set on the Module Config page, and is respected in the Webmin Users module.
+---- Changes since 1.510 ----
+Fixed a bug that broke remote command execution with parameters.
diff --git a/custom/custom-lib.pl b/custom/custom-lib.pl
index a5ebb8523..ea21dcb56 100755
--- a/custom/custom-lib.pl
+++ b/custom/custom-lib.pl
@@ -376,13 +376,14 @@ for($i=0; defined($name = $in{"name_$i"}); $i++) {
 	}
 }
 
-# set_parameter_envs(&command, command-str, &uinfo)
+# set_parameter_envs(&command, command-str, &uinfo, [set-in])
 # Sets $ENV variables based on parameter inputs, and returns the list of
 # environment variable commands, the export commands, the command string,
 # and the command string to display.
 sub set_parameter_envs
 {
-local ($cmd, $str, $uinfo) = @_;
+local ($cmd, $str, $uinfo, $setin) = @_;
+$setin ||= \%in;
 local $displaystr = $str;
 local ($env, $export, @vals);
 foreach my $a (@{$cmd->{'args'}}) {
@@ -390,42 +391,42 @@ foreach my $a (@{$cmd->{'args'}}) {
 	my $rv;
 	if ($a->{'type'} == 0 || $a->{'type'} == 5 ||
 	    $a->{'type'} == 6 || $a->{'type'} == 8) {
-		$rv = $in{$n};
+		$rv = $setin->{$n};
 		}
 	elsif ($a->{'type'} == 11) {
-		$rv = $in{$n};
+		$rv = $setin->{$n};
 		$rv =~ s/\r//g;
 		$rv =~ s/\n/ /g;
 		}
 	elsif ($a->{'type'} == 1 || $a->{'type'} == 2) {
-		(@u = getpwnam($in{$n})) || &error($text{'run_euser'});
-		$rv = $a->{'type'} == 1 ? $in{$n} : $u[2];
+		(@u = getpwnam($setin->{$n})) || &error($text{'run_euser'});
+		$rv = $a->{'type'} == 1 ? $setin->{$n} : $u[2];
 		}
 	elsif ($a->{'type'} == 3 || $a->{'type'} == 4) {
-		(@g = getgrnam($in{$n})) || &error($text{'run_egroup'});
-		$rv = $a->{'type'} == 3 ? $in{$n} : $g[2];
+		(@g = getgrnam($setin->{$n})) || &error($text{'run_egroup'});
+		$rv = $a->{'type'} == 3 ? $setin->{$n} : $g[2];
 		}
 	elsif ($a->{'type'} == 7) {
-		$rv = $in{$n} ? $a->{'opts'} : "";
+		$rv = $setin->{$n} ? $a->{'opts'} : "";
 		}
 	elsif ($a->{'type'} == 9) {
 		local $found;
 		foreach my $l (&read_opts_file($a->{'opts'})) {
-			$found++ if ($l->[0] eq $in{$n});
+			$found++ if ($l->[0] eq $setin->{$n});
 			}
 		$found || &error($text{'run_eopt'});
-		$rv = $in{$n};
+		$rv = $setin->{$n};
 		}
 	elsif ($a->{'type'} == 10) {
-		$in{$n} || &error($text{'run_eupload'});
-		if ($in{$n."_filename"} =~ /([^\/\\]+$)/ && $1) {
+		$setin->{$n} || &error($text{'run_eupload'});
+		if ($setin->{$n."_filename"} =~ /([^\/\\]+$)/ && $1) {
 			$rv = &transname("$1");
 			}
 		else {
 			$rv = &transname();
 			}
 		&open_tempfile(TEMP, ">$rv");
-		&print_tempfile(TEMP, $in{$n});
+		&print_tempfile(TEMP, $setin->{$n});
 		&close_tempfile(TEMP);
 		chown($uinfo->[2], $uinfo->[3], $rv);
 		push(@unlink, $rv);
@@ -483,6 +484,7 @@ sub execute_custom_command
 {
 local ($cmd, $env, $export, $str, $print) = @_;
 &foreign_require("proc", "proc-lib.pl");
+print STDERR "running $str\n";
 
 &clean_environment() if ($cmd->{'clear'});
 local $got;
diff --git a/custom/edit_cmd.cgi b/custom/edit_cmd.cgi
index 3c0764cca..4fa564f71 100755
--- a/custom/edit_cmd.cgi
+++ b/custom/edit_cmd.cgi
@@ -87,8 +87,10 @@ if (@servers > 1) {
 	@hosts = ( 0 ) if (!@hosts);
 	print &ui_table_row(&hlink($text{'edit_servers'}, "servers"),
 	 &ui_select("hosts", \@hosts,
-	 [ map { [ $_->{'id'}, ($_->{'desc'} || $_->{'host'}) ] } @servers ],
-	 5, 1), 3);
+		 [ sort { lc($a->[1]) cmp lc($b->[1]) }
+			map { [ $_->{'id'}, ($_->{'desc'} || $_->{'host'}) ] }
+		            @servers ],
+		 5, 1), 3);
 	}
 
 print &ui_table_end();
diff --git a/custom/run.cgi b/custom/run.cgi
index 7308455b7..2d6cd1e27 100755
--- a/custom/run.cgi
+++ b/custom/run.cgi
@@ -51,12 +51,19 @@ foreach $h (@hosts) {
 	$remote_custom_error = undef;
 	if ($h == 0) {
 		# Run locally
-		($got, $out, $timeout) = &execute_custom_command($cmd, $env, $export, $str, 1);
+		($got, $out, $timeout) = &execute_custom_command(
+					$cmd, $env, $export, $str, 1);
 		}
 	else {
 		# Foreign call
-		&remote_foreign_require($server->{'host'}, "custom", "custom-lib.pl");
-		($got, $out, $timeout) = &remote_foreign_call($server->{'host'}, "custom", "execute_custom_command", $cmd, $env, $export, $str);
+		&remote_foreign_require($server->{'host'}, "custom",
+					"custom-lib.pl");
+		&remote_foreign_call($server->{'host'}, "custom",
+				     "set_parameter_envs", $cmd, $cmd->{'cmd'},
+				     \@user_info, \%in);
+		($got, $out, $timeout) = &remote_foreign_call(
+			$server->{'host'}, "custom", "execute_custom_command",
+			$cmd, $env, $export, $str);
 		}
 	if ($h == 0) {
 		&additional_log('exec', undef, $displaystr);