diff --git a/backup-config/backup.pl b/backup-config/backup.pl
index 92a9a9a23..2c9865f28 100755
--- a/backup-config/backup.pl
+++ b/backup-config/backup.pl
@@ -79,7 +79,7 @@ if (($err || $backup->{'emode'} == 0) && $backup->{'email'}) {
 	my $email = $backup->{'email'};
 	if ($email eq '*') {
 		$email = $gconfig{'webmin_email_to'};
-		if ($gconfig{'webmin_email_to_name'}) {
+		if ($email && $gconfig{'webmin_email_to_name'}) {
 			$email = "$gconfig{'webmin_email_to_name'} <$email>";
 			}
 		}
diff --git a/fsdump/backup.pl b/fsdump/backup.pl
index 51b476837..ba4bba9d1 100755
--- a/fsdump/backup.pl
+++ b/fsdump/backup.pl
@@ -119,7 +119,7 @@ if ($out && $dump->{'email'} && &foreign_check("mailboxes")) {
 	my $email = $dump->{'email'};
 	if ($email eq '*') {
 		$email = $gconfig{'webmin_email_to'};
-		if ($gconfig{'webmin_email_to_name'}) {
+		if ($email && $gconfig{'webmin_email_to_name'}) {
 			$email = "$gconfig{'webmin_email_to_name'} <$email>";
 			}
 		}
diff --git a/package-updates/update.pl b/package-updates/update.pl
index b2b99e96c..1738e5625 100755
--- a/package-updates/update.pl
+++ b/package-updates/update.pl
@@ -92,7 +92,7 @@ if ($tellcount) {
 $emailto = $config{'sched_email'};
 if ($emailto eq '*') {
 	$emailto = $gconfig{'webmin_email_to'};
-	if ($gconfig{'webmin_email_to_name'}) {
+	if ($emailto && $gconfig{'webmin_email_to_name'}) {
 		$emailto = "$gconfig{'webmin_email_to_name'} <$emailto>";
 		}
 	}