diff --git a/record-failed.pl b/record-failed.pl
index c9976f7b5..a731b5f40 100755
--- a/record-failed.pl
+++ b/record-failed.pl
@@ -12,6 +12,7 @@ our ($remote_user);
 
 my ($username, $reason, $remoteip, $localip) = @ARGV;
 if ($username && $reason && $remoteip) {
+	$user =~ s/[^A-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 c97fd0bae..00309e512 100755
--- a/record-login.pl
+++ b/record-login.pl
@@ -12,6 +12,7 @@ our ($remote_user);
 &init_config();
 my ($username, $sid, $remoteip, $localip) = @ARGV;
 if ($username && $sid && $remoteip) {
+	$user =~ s/[^A-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 93d1798ed..b0a7bb05b 100755
--- a/record-logout.pl
+++ b/record-logout.pl
@@ -12,6 +12,7 @@ our ($remote_user);
 &init_config();
 my ($username, $sid, $remoteip, $localip) = @ARGV;
 if ($username && $sid && $remoteip) {
+	$user =~ s/[^A-z0-9\-\_\.\@]/_/g;
 	$ENV{'REMOTE_USER'} = $WebminCore::remote_user = $remote_user = $username;
 	$main::session_id = $sid;
 	$0 = "miniserv.pl";