diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index ef35eab6..fc9f9765 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-09-02 10:32+0000\n"
+"POT-Creation-Date: 2017-09-02 10:50+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"
@@ -200,17 +200,34 @@ msgstr "Passwort zurücksetzen"
 msgid ""
 "\n"
 "You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s.<br/>\n"
+"Please go to the following page and choose a new password: %(base_url)s"
+"%(password_reset_url)s<br/>\n"
+"If you didn't request a new password, ignore this e-mail.<br/>\n"
+"Thank you!\n"
+msgstr ""
+"\n"
+"Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
+"%(site_name)s zurücksetzen möchtest.<br/>\n"
+"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
+"%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
+"dann ignoriere diese E-Mail.<br/>\n"
+"Dankeschön!\n"
+
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s.\n"
 "Please go to the following page and choose a new password: %(base_url)s"
 "%(password_reset_url)s\n"
 "If you didn't request a new password, ignore this e-mail.\n"
 "Thank you!\n"
 msgstr ""
-"\n"
-"Du erhälst diese E-Mail da du dein Passwort für deinen Account bei %(site_name)s "
-"zurücksetzen möchtest.\n"
-"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s%(password_reset_url)s Solltest "
-"du kein neues Passwort angefordert haben, dann ignoriere diese E-Mail.\n"
+"Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
+"%(site_name)s zurücksetzen möchtest.\n"
+"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
+"%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
+"dann ignoriere diese E-Mail.\n"
 "Dankeschön!\n"
 
 msgid "Don't have an account yet ? "
diff --git a/hosting/templates/hosting/emails/password_reset_email.html b/hosting/templates/hosting/emails/password_reset_email.html
index 192d043c..b83a08f2 100644
--- a/hosting/templates/hosting/emails/password_reset_email.html
+++ b/hosting/templates/hosting/emails/password_reset_email.html
@@ -6,9 +6,9 @@
 {% block email_body %}
 {% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
 {% blocktrans %}
-You're receiving this email because you requested a password reset for your user account at {{site_name}}.
-Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}
-If you didn't request a new password, ignore this e-mail.
+You're receiving this email because you requested a password reset for your user account at {{site_name}}.<br/>
+Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}<br/>
+If you didn't request a new password, ignore this e-mail.<br/>
 Thank you!
 {% endblocktrans %}
 {% endblock %}
diff --git a/hosting/templates/hosting/emails/password_reset_email.txt b/hosting/templates/hosting/emails/password_reset_email.txt
index 67ac9a08..769166ed 100644
--- a/hosting/templates/hosting/emails/password_reset_email.txt
+++ b/hosting/templates/hosting/emails/password_reset_email.txt
@@ -1,12 +1,9 @@
 {% extends "datacenterlight/emails/base_email_datacenterlight.txt" %}
 {% load i18n %}
-{% block email_head %}
-{% trans 'Password Reset' %}
-{% endblock %}
+{% block email_head %}{% trans 'Password Reset' %}{% endblock %}
 {% block email_body %}
 {% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
-{% blocktrans with amount=article.price%}
-You're receiving this email because you requested a password reset for your user account at {{site_name}}.
+{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{site_name}}.
 Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}
 If you didn't request a new password, ignore this e-mail.
 Thank you!
diff --git a/utils/views.py b/utils/views.py
index 011a8491..8aea6d5b 100644
--- a/utils/views.py
+++ b/utils/views.py
@@ -86,7 +86,7 @@ class PasswordResetViewMixin(FormView):
         messages.add_message(self.request, messages.SUCCESS, self.success_message)
         context = self.test_generate_email_context(user)
         email_data = {
-            'subject': 'Password Reset',
+            'subject': _('Password Reset'),
             'to': email,
             'context': context,
             'template_name': 'password_reset_email',