diff --git a/config/environments/production.rb b/config/environments/production.rb
index ec2a4e303..ae9c17db1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -71,7 +71,8 @@
   config.action_mailer.smtp_settings = {
     address: ENV.fetch("MAILSERVER"),
     port: 25,
-    domain: ENV.fetch("MAILSERVER")
+    user_name: ENV.fetch("MAMPF_EMAIL_USERNAME"),
+    password: ENV.fetch("MAMPF_EMAIL_PASSWORD")
   }
 
   # Ignore bad email addresses and do not raise email delivery errors.
diff --git a/docker/production/docker.env b/docker/production/docker.env
index 9704dd428..11523738e 100644
--- a/docker/production/docker.env
+++ b/docker/production/docker.env
@@ -11,7 +11,7 @@ MUESLI_SERVER=https://muesli.mathi.uni-heidelberg.de
 ERDBEERE_API=https://erdbeere.mathi.uni-heidelberg.de/api/v1
 MEMCACHED_SERVER=cache
 
-# Email is send using a mailserver without authentication. Specify how to connect here
+# Email
 FROM_ADDRESS=mampf@mathi.uni-heidelberg.de
 MAILSERVER=mail.mathi.uni-heidelberg.de
 PROJECT_EMAIL=mampf@mathi.uni-heidelberg.de
@@ -22,6 +22,8 @@ IMAPSERVER=mail.mathi.uni-heidelberg.de
 PROJECT_EMAIL_USERNAME=creativeusername
 PROJECT_EMAIL_PASSWORD=secretsecret
 PROJECT_EMAIL_MAILBOX="Other Users/mampf"
+MAMPF_EMAIL_USERNAME=secret
+MAMPF_EMAIL_PASSWORD=secret
 
 # Due to CORS constraints, some urls are proxied to the media server
 DOWNLOAD_LOCATION=https://mampf.mathi.uni-heidelberg.de/mediaforward