diff --git a/backend/.env.template b/backend/.env.template
index 3e828e4c6..0551c3ca5 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -24,3 +24,6 @@ AWS_SECRET_ACCESS_KEY=
 AWS_ENDPOINT=
 AWS_REGION=
 AWS_BUCKET=
+
+EMAIL_DEFAULT_SENDER="info@human-connection.org"
+EMAIL_SUPPORT="support@human-connection.org"
diff --git a/backend/src/activitypub/routes/webfinger.js b/backend/src/activitypub/routes/webfinger.js
index e624d306a..8499879f9 100644
--- a/backend/src/activitypub/routes/webfinger.js
+++ b/backend/src/activitypub/routes/webfinger.js
@@ -45,7 +45,7 @@ export async function handler(req, res) {
   } catch (error) {
     debug(error)
     return res.status(500).json({
-      error: 'Something went terribly wrong. Please contact support@human-connection.org',
+      error: `Something went terribly wrong. Please contact ${CONFIG.EMAIL_SUPPORT}`,
     })
   } finally {
     session.close()
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 29d9f46e5..ea00d7a86 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -36,6 +36,8 @@ const {
   REDIS_DOMAIN,
   REDIS_PORT,
   REDIS_PASSWORD,
+  EMAIL_DEFAULT_SENDER,
+  EMAIL_SUPPORT,
 } = env
 
 export const requiredConfigs = {
@@ -88,6 +90,11 @@ export const s3Configs = {
   S3_CONFIGURED,
 }
 
+export const customConfigs = {
+  EMAIL_DEFAULT_SENDER,
+  EMAIL_SUPPORT,
+}
+
 export default {
   ...requiredConfigs,
   ...smtpConfigs,
@@ -97,4 +104,5 @@ export default {
   ...sentryConfigs,
   ...redisConfigs,
   ...s3Configs,
+  ...customConfigs,
 }
diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js
index b4b7b78ca..ab92aeb33 100644
--- a/backend/src/middleware/email/templateBuilder.js
+++ b/backend/src/middleware/email/templateBuilder.js
@@ -3,7 +3,7 @@ import CONFIG from '../../config'
 
 import * as templates from './templates'
 
-const from = '"Human Connection" <info@human-connection.org>'
+const from = CONFIG.EMAIL_DEFAULT_SENDER
 const supportUrl = 'https://human-connection.org/en/contact'
 
 export const signupTemplate = ({ email, nonce }) => {
diff --git a/docker-compose.yml b/docker-compose.yml
index aaf993b74..453dfac15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,6 +45,8 @@ services:
       - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
       - "DEBUG=${DEBUG}"
+      - EMAIL_SUPPORT=support@human-connection.org
+      - EMAIL_DEFAULT_SENDER=info@human-connection.org
   neo4j:
     image: schoolsinmotion/neo4j:latest
     build: