diff --git a/app/email.py b/app/email.py
index fa516327585fd55a3b60081dafa87615c66e4075..a8bde7db455633badc129e1a500efeefeea957b8 100644
--- a/app/email.py
+++ b/app/email.py
@@ -10,7 +10,7 @@ def send_async_email(app, msg):
 
 
 def send_email(to, subject, template, **kwargs):
-    msg = Message('[Opaque] {}'.format(subject), recipients=[to])
+    msg = Message('[nopaque] {}'.format(subject), recipients=[to])
     msg.body = render_template(template + '.txt.j2', **kwargs)
     msg.html = render_template(template + '.html.j2', **kwargs)
     thread = Thread(target=send_async_email,
diff --git a/app/templates/auth/email/confirm.html.j2 b/app/templates/auth/email/confirm.html.j2
index 82ce9240745ba97dc3408746cd17a1da642021b5..a666ea7d6671173142a292c33bc11e65f98c4dac 100644
--- a/app/templates/auth/email/confirm.html.j2
+++ b/app/templates/auth/email/confirm.html.j2
@@ -3,5 +3,5 @@
 <p>Alternatively, you can paste the following link in your browser's address bar:</p>
 <p>{{ url_for('auth.confirm', token=token, _external=True) }}</p>
 <p>Sincerely,</p>
-<p>The Opaque Team</p>
+<p>The nopaque Team</p>
 <p><small>Note: replies to this email address are not monitored.</small></p>
diff --git a/app/templates/auth/email/confirm.txt.j2 b/app/templates/auth/email/confirm.txt.j2
index 6421b7d01f57d69bd57c151e4ffc1b2f8c705644..41a3f17daee54297296d03795f6d587af3d5ba3b 100644
--- a/app/templates/auth/email/confirm.txt.j2
+++ b/app/templates/auth/email/confirm.txt.j2
@@ -4,6 +4,6 @@ To confirm your account please click on the following link:
 {{ url_for('auth.confirm', token=token, _external=True) }}
 
 Sincerely,
-The Opaque Team
+The nopaque Team
 
 Note: replies to this email address are not monitored.
diff --git a/app/templates/auth/email/reset_password.html.j2 b/app/templates/auth/email/reset_password.html.j2
index 5b58a2207f8b2368ccc70a975745a71c8e5d6ebe..8b4b20e0b8dd9ca840af4a2f9fe1d00b25370a0c 100644
--- a/app/templates/auth/email/reset_password.html.j2
+++ b/app/templates/auth/email/reset_password.html.j2
@@ -4,5 +4,5 @@
 <p>{{ url_for('auth.password_reset', token=token, _external=True) }}</p>
 <p>If you have not requested a password reset simply ignore this message.</p>
 <p>Sincerely,</p>
-<p>The Opaque Team</p>
+<p>The nopaque Team</p>
 <p><small>Note: replies to this email address are not monitored.</small></p>
diff --git a/app/templates/auth/email/reset_password.txt.j2 b/app/templates/auth/email/reset_password.txt.j2
index cecc5a2448973081a83f00ec0d8fab46338789a0..deb04b14fdbbd40bbb1de6bf854d497386320547 100644
--- a/app/templates/auth/email/reset_password.txt.j2
+++ b/app/templates/auth/email/reset_password.txt.j2
@@ -8,6 +8,6 @@ If you have not requested a password reset simply ignore this message.
 
 Sincerely,
 
-The Opaque Team
+The nopaque Team
 
 Note: replies to this email address are not monitored.