diff --git a/README.md b/README.md
index b088dbfd4..b52099571 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# CodeWOF
+# codeWOF
 
 CodeWOF is a website for maintaining your basic programming skills, developed at the University of Canterbury in New Zealand.
 
diff --git a/codewof/config/settings/production.py b/codewof/config/settings/production.py
index 6637ddd1e..8d4f58407 100644
--- a/codewof/config/settings/production.py
+++ b/codewof/config/settings/production.py
@@ -99,12 +99,15 @@
 
 DEFAULT_FROM_EMAIL = env(  # noqa: F405
     'DJANGO_DEFAULT_FROM_EMAIL',
-    default='CodeWOF <noreply@codewof.co.nz>'
+    default='codeWOF <noreply@codewof.co.nz>'
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#server-email
 SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL)  # noqa: F405
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-subject-prefix
-EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[CodeWOF] ')  # noqa: F405
+EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[codeWOF] ')  # noqa: F405
+
+# Email settings for all AllAuth
+ACCOUNT_EMAIL_SUBJECT_PREFIX = EMAIL_SUBJECT_PREFIX
 
 # reCAPTCHA
 # ------------------------------------------------------------------------------
diff --git a/codewof/templates/base.html b/codewof/templates/base.html
index 49dfe96ae..24ddfd312 100644
--- a/codewof/templates/base.html
+++ b/codewof/templates/base.html
@@ -49,7 +49,7 @@
         </a>
 
         {% if STAGING_ENVIRONMENT %}
-        <span class="badge badge-warning">Test server</span>
+        <span class="badge badge-warning">Test website</span>
         {% endif %}
 
         <div class="collapse navbar-collapse" id="navbarContent">