diff --git a/.devcontainer/createLocalConfig.js b/.devcontainer/createLocalConfig.js
index 49c3098a586..5447868ddb0 100644
--- a/.devcontainer/createLocalConfig.js
+++ b/.devcontainer/createLocalConfig.js
@@ -51,9 +51,10 @@ newConfig.adapters = {
 
 
 // Only update the mail settings if they aren't already set
-if (!originalConfig.mail && process.env.MAILGUN_SMTP_PASS && process.env.MAILGUN_SMTP_USER) {
+if (!originalConfig.mail && process.env.MAILGUN_SMTP_PASS && process.env.MAILGUN_SMTP_USER && process.env.MAILGUN_FROM_ADDRESS) {
     newConfig.mail = {
         transport: 'SMTP',
+        from: process.env.MAILGUN_FROM_ADDRESS,
         options: {
             service: 'Mailgun',
             host: 'smtp.mailgun.org',
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 634b0769dcc..bb4396cc18e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,6 +14,7 @@
         "STRIPE_ACCOUNT_ID": "${localEnv:STRIPE_ACCOUNT_ID}",
         "MAILGUN_SMTP_USER": "${localEnv:MAILGUN_SMTP_USER}",
         "MAILGUN_SMTP_PASS": "${localEnv:MAILGUN_SMTP_PASS}",
+        "MAILGUN_FROM_ADDRESS": "${localEnv:MAILGUN_FROM_ADDRESS}",
         "MAILGUN_API_KEY": "${localEnv:MAILGUN_API_KEY}",
         "MAILGUN_DOMAIN": "${localEnv:MAILGUN_DOMAIN}"
     },
@@ -127,13 +128,17 @@
             "description": "Your Mailgun account's SMTP password",
             "documentationUrl": "https://app.mailgun.com/mg/sending/domains"
         },
+        "MAILGUN_FROM_ADDRESS": {
+            "description": "The email address that will be used as the `from` address when sending emails via Mailgun",
+            "documentationUrl": "https://app.mailgun.com/mg/sending/domains"
+        },
         "MAILGUN_API_KEY": {
             "description": "Your Mailgun account's API key",
-            "documentationUrl": ""
+            "documentationUrl": "https://app.mailgun.com/mg/sending/domains"
         },
         "MAILGUN_DOMAIN": {
             "description": "Your Mailgun account's domain, e.g. sandbox1234567890.mailgun.org",
-            "documentationUrl": ""
+            "documentationUrl": "https://app.mailgun.com/mg/sending/domains"
         }
     }
 }