diff --git a/common/models/user.js b/common/models/user.js
index 28483950b9..938e6ed4b5 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -625,7 +625,7 @@ module.exports = function(User) {
             'server',
             'views',
             'emails',
-            'user-email-verify.ejs'
+            'user-request-update-email.ejs'
           )
         };
         return this.verify(mailOptions);
diff --git a/server/views/emails/user-request-sign-in.ejs b/server/views/emails/user-request-sign-in.ejs
index 866a77c96b..fc9cfb1bd6 100644
--- a/server/views/emails/user-request-sign-in.ejs
+++ b/server/views/emails/user-request-sign-in.ejs
@@ -14,4 +14,4 @@ Good luck with the challenges!
 
 Thanks,
 The freeCodeCamp Team.
-team@freecodecamp.com
+team@freecodecamp.org
diff --git a/server/views/emails/user-request-sign-up.ejs b/server/views/emails/user-request-sign-up.ejs
index fadeccf4bc..ec251e24e9 100644
--- a/server/views/emails/user-request-sign-up.ejs
+++ b/server/views/emails/user-request-sign-up.ejs
@@ -9,9 +9,9 @@ This above link is valid for 15 minutes.
 
 And when you have a moment:
 1. Visit the settings page and link your account to GitHub.
-2. Follow our Medium Publication: https://medium.freecodecamp.com
-3. Checkout our forum: https://forum.freecodecamp.com
-4. Join the conversation: https://gitter.im/FreeCodeCamp/FreeCodeCamp
+2. Follow our Medium Publication: https://medium.freecodecamp.org
+3. Checkout our forum: https://forum.freecodecamp.org
+4. Join the conversation: https://gitter.im/freeCodeCamp/freeCodeCamp
 
 IMPORTANT NOTE:
 If you did not make any such request, simply delete or ignore this email.
@@ -21,4 +21,4 @@ Good luck with the challenges!
 
 Thanks,
 The freeCodeCamp Team.
-team@freecodecamp.com
+team@freecodecamp.org
diff --git a/server/views/emails/user-email-verify.ejs b/server/views/emails/user-request-update-email.ejs
similarity index 93%
rename from server/views/emails/user-email-verify.ejs
rename to server/views/emails/user-request-update-email.ejs
index db8df54f39..130f5f1263 100644
--- a/server/views/emails/user-email-verify.ejs
+++ b/server/views/emails/user-request-update-email.ejs
@@ -10,4 +10,4 @@ Good luck with the challenges!
 
 Thanks,
 The freeCodeCamp Team.
-team@freecodecamp.com
+team@freecodecamp.org