diff --git a/taiga/users/templates/emails/registered_user-body-html.jinja b/taiga/users/templates/emails/registered_user-body-html.jinja
index f9ba1519..d939b1b1 100644
--- a/taiga/users/templates/emails/registered_user-body-html.jinja
+++ b/taiga/users/templates/emails/registered_user-body-html.jinja
@@ -22,7 +22,7 @@
 <strong>Support:</strong>
 <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
 <br>
-<strong>Our mailing address is:</strong>
+<strong>Our mailing list is:</strong>
 <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
 <br />
 <br />
diff --git a/taiga/users/templates/emails/registered_user-body-text.jinja b/taiga/users/templates/emails/registered_user-body-text.jinja
index dde7e8b0..d01e0ceb 100644
--- a/taiga/users/templates/emails/registered_user-body-text.jinja
+++ b/taiga/users/templates/emails/registered_user-body-text.jinja
@@ -1,12 +1,18 @@
-Welcome to Taiga, an Open Source, Agile Project Management Tool
+Thank you for registering in Taiga
 
-You, or someone you know has invited you to Taiga. You may remove your account from this service by clicking here:
+We hope you enjoy it
 
-{{ resolve_front_url('cancel-account', cancel_token) }}
+We built Taiga because we wanted the project management tool that sits open on our computers all day long, to serve as a continued reminder of why we love to collaborate, code and design.
 
-We built Taiga because we wanted the project management tool that sits open on our computers all day long, to serve as a continued reminder of why we love to collaborate, code and design. We built it to be beautiful, elegant, simple to use and fun - without forsaking flexibility and power. We named it Taiga after the forest biome, because like its namesake, our tool is at the center of an ecosystem - your team, your projects. A great project management tool also helps you see the forest for the trees. We couldn't think of  a more appropriate name for what we've done.
-
-We hope you enjoy it.
+We built it to be beautiful, elegant, simple to use and fun - without forsaking flexibility and power.
 
 --
-The Taiga development team.
+The taiga Team
+
+Copyright © 2014 Taiga Agile, LLC, All rights reserved.
+
+Contact us:
+
+Support: mailto:support@taiga.io
+Our mailing list is: https://groups.google.com/forum/#!forum/taigaio
+You may remove your account from this service: {{ resolve_front_url('cancel-account', cancel_token) }}
diff --git a/tests/integration/test_auth_api.py b/tests/integration/test_auth_api.py
index d322fa32..793d73d1 100644
--- a/tests/integration/test_auth_api.py
+++ b/tests/integration/test_auth_api.py
@@ -89,10 +89,6 @@ def test_response_200_in_public_registration(client, settings):
     assert response.data["full_name"] == "martin seamus mcfly"
     assert len(mail.outbox) == 1
     assert mail.outbox[0].subject == "You've been Taigatized!"
-    user = models.User.objects.get(username="mmcfly")
-    cancel_token = get_token_for_user(user, "cancel_account")
-    cancel_url = resolve_front_url("cancel-account", cancel_token)
-    assert mail.outbox[0].body.index(cancel_url) > 0
 
 def test_response_200_in_registration_with_github_account(client, settings):
     settings.PUBLIC_REGISTER_ENABLED = False