diff --git a/ephios/core/services/password_reset.py b/ephios/core/services/password_reset.py
index 73f6f44ed..0be0556bf 100644
--- a/ephios/core/services/password_reset.py
+++ b/ephios/core/services/password_reset.py
@@ -20,7 +20,10 @@ def password_changed(self, password, user):
             text_content = _(
                 "Your password for {site} has been changed. If you didn't request this change, contact an administrator immediately."
             ).format(site=settings.GET_SITE_URL())
-            html_content = render_to_string("email_base.html", {"message_text": text_content})
+            html_content = render_to_string(
+                "core/mails/base.html",
+                {"subject": _("Your ephios password has been changed"), "body": text_content},
+            )
             message = EmailMultiAlternatives(
                 to=[user.email],
                 subject=_("Your password has been changed"),
diff --git a/ephios/core/templates/core/mails/base.html b/ephios/core/templates/core/mails/base.html
index 40d672053..7ea12a822 100644
--- a/ephios/core/templates/core/mails/base.html
+++ b/ephios/core/templates/core/mails/base.html
@@ -90,7 +90,9 @@ <h1>{{ subject }}</h1>
             {% blocktranslate trimmed with brand='<a href="https://ephios.de/" rel="noreferrer" target="_blank">ephios</a>' %}
                 powered by {{ brand }}
             {% endblocktranslate %}
-            <samp>v{{ EPHIOS_VERSION }}</samp>
+            {% if EPHIOS_VERSION %}
+                <samp>v{{ EPHIOS_VERSION }}</samp>
+            {% endif %}
         </small>
         <br/>
         <a href="https://ephios.de">