diff --git a/arkindex/project/config.py b/arkindex/project/config.py
index edcb4e3a4f736c881cd14a091047bf0707502569..b97f561fc4b63e234fb82432f7d4847c544aa4e8 100644
--- a/arkindex/project/config.py
+++ b/arkindex/project/config.py
@@ -112,6 +112,7 @@ def get_settings_parser(base_dir):
     email_parser.add_option("port", type=int)
     email_parser.add_option("user", type=str)
     email_parser.add_option("password", type=str)
+    email_parser.add_option("from_address", type=str, default=None)
     email_parser.add_option("error_report_recipients", type=str, many=True, default=[])
 
     export_parser = parser.add_subparser("export", default={})
diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py
index d3173a6245291737df01f330537e19716a2d166f..e7daebda121af5e1cfdf1659ee4fe726cf6c9805 100644
--- a/arkindex/project/settings.py
+++ b/arkindex/project/settings.py
@@ -480,7 +480,7 @@ if conf["email"]:
     EMAIL_HOST = conf["email"]["host"]
     EMAIL_PORT = conf["email"]["port"]
     EMAIL_HOST_USER = conf["email"]["user"]
-    DEFAULT_FROM_EMAIL = SERVER_EMAIL = EMAIL_HOST_USER
+    DEFAULT_FROM_EMAIL = SERVER_EMAIL = conf["email"]["from_address"] or EMAIL_HOST_USER
     EMAIL_HOST_PASSWORD = conf["email"]["password"]
     EMAIL_USE_TLS = True
 else:
diff --git a/arkindex/project/tests/config_samples/override.yaml b/arkindex/project/tests/config_samples/override.yaml
index 1de12bd3e8d5ab4153378b78a765ef46c79f682b..fed278c1c26d9b17837037b68b9b6922cffe7745 100644
--- a/arkindex/project/tests/config_samples/override.yaml
+++ b/arkindex/project/tests/config_samples/override.yaml
@@ -39,6 +39,7 @@ database:
 email:
   error_report_recipients:
   - noreply@nasa.gov
+  from_address: None
   host: smtp.wanadoo.fr
   password: hunter2
   port: 25