diff --git a/acl/save_user.cgi b/acl/save_user.cgi
index 4c688aa1f..ae1f34de9 100755
--- a/acl/save_user.cgi
+++ b/acl/save_user.cgi
@@ -57,7 +57,7 @@ else {
 &error_setup($text{'save_err'});
 
 # Validate username, and check for a clash
-$in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ && $in{'name'} !~ /^\@/ ||
+$in{'name'} =~ /^[A-Za-z0-9\-\_\.\@]+$/ && $in{'name'} !~ /^\@/ ||
 	&error(&text('save_ename', &html_escape($in{'name'})));
 $in{'name'} eq 'webmin' && &error($text{'save_enamewebmin'});
 if (!$in{'old'} || $in{'old'} ne $in{'name'}) {
diff --git a/record-failed.pl b/record-failed.pl
index 50b8e4016..7603641d2 100755
--- a/record-failed.pl
+++ b/record-failed.pl
@@ -12,7 +12,7 @@ our ($remote_user);
 
 my ($username, $reason, $remoteip, $localip) = @ARGV;
 if ($username && $reason && $remoteip) {
-	$username =~ s/[^A-z0-9\-\_\.\@]/_/g;
+	$username =~ s/[^A-Za-z0-9\-\_\.\@]/_/g;
 	$ENV{'REMOTE_USER'} = $WebminCore::remote_user = $remote_user = $username;
 	$0 = "miniserv.pl";
 	&webmin_log("failed", undef, $reason, undef, "global", undef,
diff --git a/record-login.pl b/record-login.pl
index ef45deacd..6ceebea51 100755
--- a/record-login.pl
+++ b/record-login.pl
@@ -12,7 +12,7 @@ our ($remote_user);
 &init_config();
 my ($username, $sid, $remoteip, $localip) = @ARGV;
 if ($username && $sid && $remoteip) {
-	$username =~ s/[^A-z0-9\-\_\.\@]/_/g;
+	$username =~ s/[^A-Za-z0-9\-\_\.\@]/_/g;
 	$ENV{'REMOTE_USER'} = $WebminCore::remote_user = $remote_user = $username;
 	$main::session_id = $sid;
 	$0 = "miniserv.pl";
diff --git a/record-logout.pl b/record-logout.pl
index d9baccf79..c9ae46963 100755
--- a/record-logout.pl
+++ b/record-logout.pl
@@ -12,7 +12,7 @@ our ($remote_user);
 &init_config();
 my ($username, $sid, $remoteip, $localip) = @ARGV;
 if ($username && $sid && $remoteip) {
-	$username =~ s/[^A-z0-9\-\_\.\@]/_/g;
+	$username =~ s/[^A-Za-z0-9\-\_\.\@]/_/g;
 	$ENV{'REMOTE_USER'} = $WebminCore::remote_user = $remote_user = $username;
 	$main::session_id = $sid;
 	$0 = "miniserv.pl";