diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 52d9623e..36f84f26 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-10-10 21:35+0530\n"
+"POT-Creation-Date: 2017-10-16 00:57+0530\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"
@@ -144,6 +144,21 @@ msgid ""
 "browser to activate your Data Center Light account."
 msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers."
 
+msgid "Your account details are as follows"
+msgstr ""
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Your email address"
+msgstr "Deine E-Mail-Adresse"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "You can reset your password here"
+msgstr "Passwort zurücksetzen"
+
 msgid ""
 "You can copy and paste the following link into the address bar of your "
 "browser to activate your Data Center Light account."
@@ -546,9 +561,6 @@ msgstr ""
 #~ "kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich "
 #~ "umgehend um dein Anliegen kümmern!"
 
-#~ msgid "Email Address"
-#~ msgstr "E-Mail-Adresse"
-
 #~ msgid "is not a proper name"
 #~ msgstr "ist kein gültiger Name"
 
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index 7008c1a1..8f270a3f 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -33,6 +33,18 @@
                 <p style="color: #4382c8; line-height: 1.4; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
                     {{base_url}}{{activation_link}}
                 </p>
+                <p>
+                    {% if account_details %}
+                        {% url 'hosting:reset_password' as reset_password_url %}
+                        {% trans "Your account details are as follows" %}:
+
+                        {% trans "Username" %} : {% trans "Your email address" %}
+                        {% trans "Password" %} : {{account_details}}
+
+                        {% trans "You can reset your password here" %}:
+                        {{base_url}}{{reset_password_url}}
+                    {% endif %}
+                </p>
             </td>
         </tr>
         <tr>
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
index 13b3e7bf..4f66e239 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
@@ -6,4 +6,15 @@
 
 {{base_url}}{{activation_link}}
 
+{% if account_details %}
+    {% url 'hosting:reset_password' as reset_password_url %}
+    {% trans "Your account details are as follows" %}:
+
+    {% trans "Username" %} : {% trans "Your email address" %}
+    {% trans "Password" %} : {{account_details}}
+
+    {% trans "You can reset your password here" %}:
+    {{base_url}}{{reset_password_url}}
+{% endif %}
+
 {% trans "Your Data Center Light Team" %}
\ No newline at end of file
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 60090cb6..fa24637a 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/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-10-10 21:35+0530\n"
+"POT-Creation-Date: 2017-10-16 01:06+0530\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"
@@ -199,8 +199,8 @@ msgid "You have ordered a new virtual machine!"
 msgstr "Du hast eine neue virtuelle Maschine bestellt!"
 
 #, python-format
-msgid "Your order of [ <strong>%(vm_name)s</strong> ] has been charged."
-msgstr "Deine Bestellung von [ <strong>%(vm_name)s</strong> ] wurde erhoben."
+msgid "Your order of <strong>%(vm_name)s</strong> has been charged."
+msgstr "Deine Bestellung von <strong>%(vm_name)s</strong> wurde erhoben."
 
 msgid "You can view your VM detail by clicking the button below."
 msgstr "Um die Rechnung zu sehen, klicke auf den Button unten."
@@ -212,8 +212,8 @@ msgid "Your Data Center Light Team"
 msgstr "Dein Data Center Light Team"
 
 #, python-format
-msgid "Your order of [%(vm_name)s] has been charged."
-msgstr "Deine Bestellung von [%(vm_name)s] wurde erhoben."
+msgid "Your order of %(vm_name)s has been charged."
+msgstr "Deine Bestellung von %(vm_name)s wurde erhoben."
 
 msgid "You can view your VM detail by following the link below."
 msgstr "Um die Rechnung zu sehen, klicke auf den Link unten."
@@ -240,11 +240,11 @@ msgstr "VM Kündigung"
 
 #, python-format
 msgid ""
-"You are receiving this email because your virutal machine [ <strong>"
-"%(vm_name)s</strong> ] has been cancelled."
+"You are receiving this email because your virutal machine <strong>"
+"%(vm_name)s</strong> has been cancelled."
 msgstr ""
-"Du erhälst diese E-Mail, da deine virtuelle Maschine [ <strong>%(vm_name)s</"
-"strong> ] gekündigt wurde."
+"Du erhälst diese E-Mail, da deine virtuelle Maschine <strong>%(vm_name)s</"
+"strong> gekündigt wurde."
 
 msgid "You can always order a new VM by clicking the button below."
 msgstr ""
@@ -256,10 +256,10 @@ msgstr "NEUE VM"
 
 #, python-format
 msgid ""
-"You are receiving this email because your virutal machine [%(vm_name)s] has "
+"You are receiving this email because your virutal machine %(vm_name)s has "
 "been cancelled."
 msgstr ""
-"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt "
+"Du erhälst diese E-Mail, da deine virtuelle Maschine %(vm_name)s gekündigt "
 "wurde."
 
 msgid "You can always order a new VM by following the link below."