diff --git a/src/lib/Hydra/Helper/Email.pm b/src/lib/Hydra/Helper/Email.pm
index 47fc5629..e628fca3 100644
--- a/src/lib/Hydra/Helper/Email.pm
+++ b/src/lib/Hydra/Helper/Email.pm
@@ -13,7 +13,7 @@ sub sendEmail {
     my ($config, $to, $subject, $body, $extraHeaders) = @_;
 
     my $url = getBaseUrl($config);
-    my $sender = $config->{'notification_sender'} // (($ENV{'USER'} // "hydra") .  "@" . $url);
+    my $sender = $config->{'notification_sender'} // (($ENV{'USER'} // "hydra") .  "@" . hostname_long);
 
     my @headers = (
         To => $to,