diff --git a/src/Command/SendNotificationsCommand.php b/src/Command/SendNotificationsCommand.php
index 7fecae049..021d25992 100644
--- a/src/Command/SendNotificationsCommand.php
+++ b/src/Command/SendNotificationsCommand.php
@@ -123,9 +123,9 @@ private function determineSender(ForumPost $post): Address
     {
         $thread = $post->getThread();
         if ($thread->getGroup()) {
-            $from = new Address('group@bewelcome.org', 'BeWelcome - ' . $post->getAuthor()->getUsername());
+            $from = new Address('noreply@bewelcome.org', 'BeWelcome - ' . $post->getAuthor()->getUsername());
         } else {
-            $from = new Address('forum@bewelcome.org', 'BeWelcome - ' . $post->getAuthor()->getUsername());
+            $from = new Address('noreply@bewelcome.org', 'BeWelcome - ' . $post->getAuthor()->getUsername());
         }
 
         return $from;
diff --git a/src/Service/Mailer.php b/src/Service/Mailer.php
index ce9fbcba6..9dc432af9 100644
--- a/src/Service/Mailer.php
+++ b/src/Service/Mailer.php
@@ -23,8 +23,9 @@
 class Mailer
 {
     private const NO_REPLY_EMAIL_ADDRESS = 'noreply@bewelcome.org';
-    private const MESSAGE_EMAIL_ADDRESS = 'message@bewelcome.org';
-    private const GROUP_EMAIL_ADDRESS = 'group@bewelcome.org';
+    private const MESSAGE_EMAIL_ADDRESS = 'noreply@bewelcome.org';
+    private const GROUP_EMAIL_ADDRESS   = 'noreply@bewelcome.org';
+    private const FORUM_EMAIL_ADDRESS   = 'noreply@bewelcome.org';
     private const PASSWORD_EMAIL_ADDRESS = 'password@bewelcome.org';
     private const SIGNUP_EMAIL_ADDRESS = 'signup@bewelcome.org';
     private const ACCOUNT_FEEDBACK_ADDRESS = 'account@bewelcome.org';