diff --git a/web/src/mail/forgot_password.rs b/web/src/mail/forgot_password.rs
index ac45ac6b..2aae30de 100644
--- a/web/src/mail/forgot_password.rs
+++ b/web/src/mail/forgot_password.rs
@@ -1,8 +1,8 @@
+use askama::Template;
 use lettre::{
     message::{Mailbox, MultiPart, SinglePart},
-    AsyncTransport, Message,
+    Address, AsyncTransport, Message,
 };
-use askama::Template;
 
 use crate::{models::User, utils::ApplicationError};
 
@@ -55,9 +55,14 @@ fn build(
     }
     .to_string();
 
+    let sender_mailbox = Mailbox::new(
+        Some("noreply".to_string()),
+        Address::new("noreply", &hostname)?,
+    );
+
     let message = Message::builder()
-        .from("noreply <noreply@brasiwa-leipzig.de>".parse()?)
-        .reply_to("noreply <noreply@brasiwa-leipzig.de>".parse()?)
+        .from(sender_mailbox.clone())
+        .reply_to(sender_mailbox)
         .to(Mailbox::new(Some(name.to_string()), email.parse()?))
         .subject("Brass: Zurücksetzen des Passworts angefordert")
         .multipart(
diff --git a/web/src/mail/registration.rs b/web/src/mail/registration.rs
index 4899e2b2..633865a6 100644
--- a/web/src/mail/registration.rs
+++ b/web/src/mail/registration.rs
@@ -1,8 +1,7 @@
-use lettre::{
-    message::{Mailbox, MultiPart, SinglePart},
-    AsyncTransport, Message,
-};
 use askama::Template;
+use lettre::{
+    message::{Mailbox, MultiPart, SinglePart}, Address, AsyncTransport, Message
+};
 
 use crate::{models::User, utils::ApplicationError};
 
@@ -59,9 +58,14 @@ fn build(
     }
     .to_string();
 
+    let sender_mailbox = Mailbox::new(
+        Some("noreply".to_string()),
+        Address::new("noreply", &hostname)?,
+    );
+
     let message = Message::builder()
-        .from("noreply <noreply@brasiwa-leipzig.de>".parse()?)
-        .reply_to("noreply <noreply@brasiwa-leipzig.de>".parse()?)
+        .from(sender_mailbox.clone())
+        .reply_to(sender_mailbox)
         .to(Mailbox::new(Some(name.to_string()), email.parse()?))
         .subject("Brass: Registrierung deines Accounts")
         .multipart(