diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 80d88c04..cdffc92f 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-02 03:08+0530\n"
+"POT-Creation-Date: 2017-09-02 07:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,6 +102,9 @@ msgstr ""
 msgid "SUBMIT"
 msgstr "ABSENDEN"
 
+msgid "Your Data Center Light Team"
+msgstr "Dein Data Center Light Team"
+
 msgid "Thank you for your request."
 msgstr "Vielen Dank für Ihre Anfrage."
 
@@ -125,34 +128,24 @@ msgstr ""
 msgid "Thank you!"
 msgstr "Vielen Dank!"
 
-msgid "account activation"
-msgstr "Accountaktivierung"
+msgid "Account Activation"
+msgstr "Account Aktivierung"
 
 #, python-format
 msgid ""
 "\n"
-"                You can activate your %(dcl_text)s account by <a href="
-"\"%(base_url)s%(activation_link)s\">clicking here</a>.<br/><br/>\n"
-"                You can also copy and paste the following link into the "
-"address bar of your browser and follow the link in order to activate your "
-"datacenterlight account.<br/>\n"
-"                %(base_url)s%(activation_link)s\n"
-"                "
+"You can activate your Data Center Light account by <a href=\"%(base_url)s"
+"%(activation_link)s\">clicking here</a>.<br/>\n"
+"You can also copy and paste the following link into the address bar of your "
+"browser<br/>\n"
+"to activate your Data Center Light account.<br/>\n"
+"%(base_url)s%(activation_link)s\n"
 msgstr ""
 "\n"
-"                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> "
-"um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
-"                Oder kopiere den folgenden Link in die Adressleiste deines "
-"Browsers und folge dann dem Link um deinen %(dcl_text)s Account zu "
-"aktivieren.<br/>\n"
-"                %(base_url)s%(activation_link)s\n"
-"                "
-
-msgid "Your"
-msgstr "Dein"
-
-msgid "team"
-msgstr "Team"
+"<a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> "
+"um deinen Data Center Light Account zu aktivieren oder kopiere den folgenden " 
+"Link in die Adressleiste deines Browsers.<br/>\n"
+"%(base_url)s%(activation_link)s\n"
 
 #, python-format
 msgid ""
@@ -481,6 +474,12 @@ msgstr "ist kein gültiger Name"
 msgid "is not a proper email"
 msgstr "ist keine gültige E-Mailadresse"
 
+#~ msgid "Your"
+#~ msgstr "Dein"
+
+#~ msgid "team"
+#~ msgstr "Team"
+
 #~ msgid "Questions?"
 #~ msgstr "Fragen?"
 
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index 1f0df691..ed2753a3 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -2,7 +2,7 @@
 {% load static from staticfiles %}
 {% load i18n %}
 {% block email_head %}
-    {{dcl_text}} {% trans 'account activation' %}
+    {{dcl_text}} {% trans 'Account Activation' %}
 {% endblock %}
 {% block email_body %}
 {% blocktrans %}
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
index e40ef956..881e8087 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
@@ -1,11 +1,14 @@
+{% extends "datacenterlight/emails/base_email.txt" %}
 {% load static from staticfiles %}
 {% load i18n %}
-{{dcl_text}} {% trans 'account activation' %}
+{% block email_head %}
+    {{dcl_text}} {% trans 'Account Activation' %}
+{% endblock %}
 
+{% block email_body %}
 {% blocktrans %}
 Hi,
 
 You can activate your {{dcl_text}} account by clicking here {{base_url}}{{activation_link}}
 {% endblocktrans %}
-
-{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}
+{% endblock %}