diff --git a/config/default.json b/config/default.json
index ee0b06182..2495c9f9d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -100,6 +100,8 @@
       }
     },
     "from": "Citizen OS <no-reply@citizenos.com>",
+    "supportTo": "support@citizenos.com",
+    "feedbackTo": "support@citizenos.com",
     "linkToPrivacyPolicy": "https://app.citizenos.com/en/topics/7abdd244-d45b-40d3-997c-a6290d4e972c",
     "linkViewModerationGuidelines": "https://app.citizenos.com/en/topics/ac8b66a4-ca56-4d02-8406-5e19da73d7ce",
     "trap": false,
diff --git a/libs/email.js b/libs/email.js
index a9d7e84a2..d635dc278 100644
--- a/libs/email.js
+++ b/libs/email.js
@@ -341,9 +341,8 @@ module.exports = function (app) {
             _.cloneDeep(EMAIL_OPTIONS_DEFAULT), // Deep clone to guarantee no funky business messing with the class level defaults, cant use Object.assign({}.. as this is not a deep clone.
             {
                 subject: 'Help request',
-                to: ['support@citizenos.com'],
+                to: [config.email.supportTo],
                 replyTo: debugData.email,
-                from: "no-reply@citizenos.com",
                 linkedData: {
                     translations: template.translations,
                 },
@@ -369,8 +368,7 @@ module.exports = function (app) {
             _.cloneDeep(EMAIL_OPTIONS_DEFAULT), // Deep clone to guarantee no funky business messing with the class level defaults, cant use Object.assign({}.. as this is not a deep clone.
             {
                 subject: 'Feedback',
-                to: ['support@citizenos.com'],
-                from: "no-reply@citizenos.com",
+                to: [config.email.feedbackTo],
                 linkedData: {
                     translations: template.translations,
                 },
@@ -410,7 +408,6 @@ module.exports = function (app) {
                 {
                     subject: template.translations.ACCOUNT_VERIFICATION.SUBJECT,
                     to: user.email,
-                    from: "no-reply@citizenos.com",
                     //Placeholders
                     toUser: user,
                     linkVerify: linkVerify
@@ -450,7 +447,6 @@ module.exports = function (app) {
                 {
                     subject: template.translations.PASSWORD_RESET.SUBJECT,
                     to: user.email,
-                    from: "no-reply@citizenos.com",
                     //Placeholders..
                     toUser: user,
                     linkReset: urlLib.getFe('/account/password/reset/:passwordResetCode', { passwordResetCode: passwordResetCode }, { email: user.email })