diff --git a/lms/templates/courseware/courseware-error.html b/lms/templates/courseware/courseware-error.html
index 169c7de8bc..e289e1c99d 100644
--- a/lms/templates/courseware/courseware-error.html
+++ b/lms/templates/courseware/courseware-error.html
@@ -12,6 +12,6 @@
 <section class="container">
   <section class="outside-app">
     <h1>There has been an error on the <span class="edx">edX</span> servers</h1>
-    <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
+    <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
   </section>
 </section>
diff --git a/lms/templates/emails/reject_name_change.txt b/lms/templates/emails/reject_name_change.txt
index 5d9edc363b..37be970830 100644
--- a/lms/templates/emails/reject_name_change.txt
+++ b/lms/templates/emails/reject_name_change.txt
@@ -2,4 +2,4 @@
 
 We are sorry. Our course staff did not approve your request to change
 your name from ${old_name} to ${new_name}. If you need further
-assistance, please e-mail the course staff at ta@mitx.mit.edu.
+assistance, please e-mail the course staff at ta@edx.org.
diff --git a/lms/templates/module-error.html b/lms/templates/module-error.html
index 8855c5be48..3ea605dc27 100644
--- a/lms/templates/module-error.html
+++ b/lms/templates/module-error.html
@@ -1,6 +1,6 @@
 <section class="outside-app">
   <h1>There has been an error on the <em>MITx</em> servers</h1>
-  <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
+  <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 
 % if staff_access:
 <h1>Details</h1>
diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html
index 478f197a79..7fada34a53 100644
--- a/lms/templates/static_templates/server-down.html
+++ b/lms/templates/static_templates/server-down.html
@@ -2,5 +2,5 @@
 
 <section class="outside-app">
   <h1>Currently the <em>edX</em> servers are down</h1>
-  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
+  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 </section>
diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html
index fd00f0d734..88ca32ff80 100644
--- a/lms/templates/static_templates/server-error.html
+++ b/lms/templates/static_templates/server-error.html
@@ -2,5 +2,5 @@
 
 <section class="outside-app">
   <h1>There has been a 500 error on the <em>edX</em> servers</h1>
-  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
+  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 </section>
diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html
index 7f4dc6f236..a202923fcd 100644
--- a/lms/templates/static_templates/server-overloaded.html
+++ b/lms/templates/static_templates/server-overloaded.html
@@ -2,5 +2,5 @@
 
 <section class="outside-app">
   <h1>Currently the <em>MITx</em> servers are overloaded</h1>
-  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
+  <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 </section>