diff --git a/core/server/services/members/settings.js b/core/server/services/members/settings.js
index d8c336a772..adebccebc4 100644
--- a/core/server/services/members/settings.js
+++ b/core/server/services/members/settings.js
@@ -71,13 +71,18 @@ function createSettingsInstance(config) {
     });
 
     const sendEmailAddressUpdateMagicLink = ({email, payload = {}, type = 'fromAddressUpdate'}) => {
+        const [,toDomain] = email.split('@');
+        let fromEmail = `noreply@${toDomain}`;
+        if (fromEmail === email) {
+            fromEmail = `no-reply@${toDomain}`;
+        }
         magicLinkService.transporter = {
             sendMail(message) {
                 if (process.env.NODE_ENV !== 'production') {
                     logging.warn(message.text);
                 }
                 let msg = Object.assign({
-                    from: email,
+                    from: fromEmail,
                     subject: 'Update email address',
                     forceTextContent: true
                 }, message);