diff --git a/CHANGELOG.md b/CHANGELOG.md
index cacd2da78..41efc4ab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Extractors can now specify an extractor_key and an owner (email address) when sending a
 registration or heartbeat to Clowder that will restrict use of that extractor to them.
 - Added a dropdown menu to select all spaces, your spaces and also the spaces you have access to. [#374](https://github.com/clowder-framework/clowder/issues/374)
+- Add SMTP_FROM in docker-compose yml file. [#417](https://github.com/clowder-framework/clowder/issues/417)
 - Keycloak provider with secure social [#419](https://github.com/clowder-framework/clowder/issues/419)
 - Documentation on how to do easy testing of pull requests
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 45b90a271..1e9f05fcb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,6 +67,7 @@ services:
       - RABBITMQ_CLOWDERURL=${RABBITMQ_CLOWDERURL:-http://clowder:9000}
       - SMTP_MOCK=${SMTP_MOCK:-true}
       - SMTP_SERVER=${SMTP_SERVER:-smtp}
+      - SMTP_FROM=${SMTP_FROM:-devnull@ncsa.illinois.edu}
       - CLOWDER_STORAGE=${CLOWDER_STORAGE:-services.filesystem.DiskByteStorageService}
       - CLOWDER_DISKPATH=${CLOWDER_DISKPATH:-/home/clowder/data}
       - S3_ENDPOINT=${S3_ENDPOINT:-http://minio:9000}
diff --git a/docker/custom.conf b/docker/custom.conf
index a7f02f2f1..52f1fb090 100644
--- a/docker/custom.conf
+++ b/docker/custom.conf
@@ -32,6 +32,8 @@ smtp.mock=true
 smtp.mock=${?SMTP_MOCK}
 smtp.host="smtp"
 smtp.host=${?SMTP_SERVER}
+smtp.from="devnull@ncsa.illinois.edu"
+smtp.from=${?SMTP_FROM}
 
 # storage
 service.byteStorage=services.filesystem.DiskByteStorageService