diff --git a/package-updates/index.cgi b/package-updates/index.cgi
index 2a7da37ef..89d232301 100755
--- a/package-updates/index.cgi
+++ b/package-updates/index.cgi
@@ -209,9 +209,16 @@ print &ui_table_row($text{'index_sched'},
 			         [ 'w', $text{'index_schedw'} ] ]));
 
 # Send email to
-print &ui_table_row($text{'index_email'},
-	    &ui_textbox("email", $config{'sched_email'} ||
-				 $gconfig{'webmin_email_to'}, 40));
+if ($gconfig{'webmin_email_to'}) {
+	$efield = &ui_opt_textbox("email",
+		$config{'sched_email'} eq '*' ? undef : $config{'sched_email'},
+		40, &text('index_email_def',
+			  "<tt>$gconfig{'webmin_email_to'}</tt>"));
+	}
+else {
+	$efield = &ui_textbox("email", $config{'sched_email'}, 40);
+	}
+print &ui_table_row($text{'index_email'}, $efield);
 
 # Install or just notify?
 print &ui_table_row($text{'index_action'},
diff --git a/package-updates/lang/en b/package-updates/lang/en
index e9307ee71..f4c5e6d00 100644
--- a/package-updates/lang/en
+++ b/package-updates/lang/en
@@ -18,6 +18,7 @@ index_schedh=hour
 index_schedd=day
 index_schedw=week
 index_email=Email updates report to
+index_email_def=Webmin default ($1)
 index_action=Action when update needed
 index_action-1=Just notify for security updates
 index_action0=Just notify for any updates
diff --git a/package-updates/save_sched.cgi b/package-updates/save_sched.cgi
index 02069dfa1..23b380e8e 100755
--- a/package-updates/save_sched.cgi
+++ b/package-updates/save_sched.cgi
@@ -5,7 +5,7 @@ require './package-updates-lib.pl';
 &ReadParse();
 
 &lock_file($module_config_file);
-$config{'sched_email'} = $in{'email'};
+$config{'sched_email'} = $in{'email_def'} ? '*' : $in{'email'};
 $config{'sched_action'} = $in{'action'};
 &save_module_config();
 &unlock_file($module_config_file);
diff --git a/package-updates/update.pl b/package-updates/update.pl
index 5f6a04dd9..fe90e715f 100755
--- a/package-updates/update.pl
+++ b/package-updates/update.pl
@@ -56,7 +56,8 @@ if ($tellcount) {
 	}
 
 # Email the admin
-$emailto = $config{'sched_email'} || $gconfig{'webmin_email_to'};
+$emailto = $config{'sched_email'} eq '*' ? $gconfig{'webmin_email_to'}
+					 : $config{'sched_email'};
 if ($emailto && $body) {
 	&foreign_require("mailboxes", "mailboxes-lib.pl");
 	my $from = &mailboxes::get_from_address();