diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
index 741bdf9127..364695d590 100644
--- a/lms/envs/dev_edx4edx.py
+++ b/lms/envs/dev_edx4edx.py
@@ -24,7 +24,7 @@ if 'eecs1' in socket.gethostname():
 # edx4edx content server
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mit.edu'
+MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu'
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
 #-----------------------------------------------------------------------------
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index 4343da37f8..45789c9c47 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -1,4 +1,4 @@
-Someone, hopefully you, signed up for an account for MITx's on-line
+Someone, hopefully you, signed up for an account for edX's on-line
 offering of "${ course_title}" using this email address. If it was
 you, and you'd like to activate and use your account, copy and paste
 this address into your web browser's address bar:
diff --git a/lms/templates/emails/activation_email_subject.txt b/lms/templates/emails/activation_email_subject.txt
index 00231fa8b1..c25c006a81 100644
--- a/lms/templates/emails/activation_email_subject.txt
+++ b/lms/templates/emails/activation_email_subject.txt
@@ -1 +1 @@
-Your account for MITx's on-line 6.002
+Your account for edX's on-line ${course_title} course