diff --git a/src/ultimate/settings/base.py.dist b/src/ultimate/settings/base.py.dist
index 8f71f993..0254245f 100644
--- a/src/ultimate/settings/base.py.dist
+++ b/src/ultimate/settings/base.py.dist
@@ -8,10 +8,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # Django settings for ultimate-league-app project.
 
 ADMINS = (
-    ('Ann Arbor Ultimate', 'webmaster@annarborultimate.org'),
+    ('Ann Arbor Ultimate', 'web@annarborultimate.org'),
 )
 
-DEFAULT_FROM_EMAIL = 'Ann Arbor Ultimate <webmaster@a2ultimate.org>'
+DEFAULT_FROM_EMAIL = 'Ann Arbor Ultimate <web@annarborultimate.org>'
 
 MANAGERS = ADMINS
 
diff --git a/src/ultimate/templates/500.html b/src/ultimate/templates/500.html
index 61e5c599..17ae110d 100644
--- a/src/ultimate/templates/500.html
+++ b/src/ultimate/templates/500.html
@@ -4,5 +4,5 @@
 
 {% block content %}
   <h1>500 Unexpected Error</h1>
-  <p>There was an unexpected error. Please email <a href="mailto:webmaster@annarborultimate.org">webmaster@annarborultimate.org</a> with details.</p>
+  <p>There was an unexpected error. Please email <a href="mailto:web@annarborultimate.org">web@annarborultimate.org</a> with details.</p>
 {% endblock %}
diff --git a/src/ultimate/templates/user/registration/password_reset_email.html b/src/ultimate/templates/user/registration/password_reset_email.html
index 81cadca0..0e39a67c 100644
--- a/src/ultimate/templates/user/registration/password_reset_email.html
+++ b/src/ultimate/templates/user/registration/password_reset_email.html
@@ -3,7 +3,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-  {{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb64=uid token=token %}
+  {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
 {% endblock %}
 {% trans "Your email, in case you have forgotten:" %} {{ user.email }}