diff --git a/cms/envs/common.py b/cms/envs/common.py
index 0196ddc9e5..896c4515a2 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -132,10 +132,10 @@ IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS
 
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index d0da67f247..e36bcf4b96 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -402,7 +402,8 @@ def password_reset(request):
     if form.is_valid():
         form.save( use_https = request.is_secure(),
                    from_email = settings.DEFAULT_FROM_EMAIL,
-                   request = request )
+                   request = request,
+                   domain_override = settings.SITE_NAME )
         return HttpResponse(json.dumps({'success':True,
                                         'value': render_to_string('registration/password_reset_done.html', {})}))
     else:
diff --git a/lms/envs/common.py b/lms/envs/common.py
index f0571d19cf..3b005c5dbe 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -158,17 +158,17 @@ TEMPLATE_DEBUG = False
 
 # Site info
 SITE_ID = 1
-SITE_NAME = "localhost:8000"
+SITE_NAME = "edx.org"
 HTTPS = 'on'
 ROOT_URLCONF = 'lms.urls'
 IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS