diff --git a/tfjm/settings_prod.py b/tfjm/settings_prod.py
index ac9168b..c7cd466 100644
--- a/tfjm/settings_prod.py
+++ b/tfjm/settings_prod.py
@@ -20,8 +20,8 @@ EMAIL_PORT = os.getenv("SMTP_PORT")
 EMAIL_HOST_USER = os.getenv("SMTP_HOST_USER")
 EMAIL_HOST_PASSWORD = os.getenv("SMTP_HOST_PASSWORD")
 
-DEFAULT_FROM_EMAIL = os.getenv('FROM_EMAIL', 'Contact TFJM² <contact@tfjm.org>')
 SERVER_EMAIL = os.getenv('SERVER_EMAIL', 'contact@tfjm.org')
+DEFAULT_FROM_EMAIL = os.getenv('FROM_EMAIL', 'Contact TFJM²') + f" <{SERVER_EMAIL}>"
 
 # Security settings
 SECURE_CONTENT_TYPE_NOSNIFF = False