diff --git a/aleksis/core/templates/account/password_reset.html b/aleksis/core/templates/account/password_reset.html
index b9847dc1d44a6f34488e74814e016049fadb8155..04d4ee1a110d908646871b3df8c5c773eee0bac2 100644
--- a/aleksis/core/templates/account/password_reset.html
+++ b/aleksis/core/templates/account/password_reset.html
@@ -9,7 +9,7 @@
   <div class="alert warning">
     <p>
       <i class="material-icons left">warning</i>
-      {% blocktrans %}Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it..{% endblocktrans %}
+      {% blocktrans %}Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it.{% endblocktrans %}
     </p>
   </div>
 
@@ -19,8 +19,8 @@
       {% blocktrans %}Please contact one of your site administrators, if you
       have any troblue resetting your password:{% endblocktrans %}
     </p>
-    {% include "core/partials/admins_list.html" %}
   </div>
+  {% include "core/partials/admins_list.html" %}
 
   <form method="post" action="{% url 'account_reset_password' %}" class="password_reset">
     {% csrf_token %}
diff --git a/aleksis/core/templates/account/password_reset_done.html b/aleksis/core/templates/account/password_reset_done.html
index e4f27d56bf77b67b2f2371ce26af1a85799434bf..b1a4a482a3ee64b0f2c6339e76ed44c66b29ef50 100644
--- a/aleksis/core/templates/account/password_reset_done.html
+++ b/aleksis/core/templates/account/password_reset_done.html
@@ -11,7 +11,7 @@
     <div class="card green">
       <div class="card-content white-text">
         <div class="material-icons small left">success</div>
-        <span class="card-title">{% blocktrans %}Password reset mail sent!{% endblock %}</span>
+        <span class="card-title">{% blocktrans %}Password reset mail sent!{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
             We have sent you an e-mail. Please contact one of your site
diff --git a/aleksis/core/templates/account/password_reset_from_key.html b/aleksis/core/templates/account/password_reset_from_key.html
index b4284e0ebe423fbdcf01315e5750ed07584dd3ac..5b3d7c7ae59b19ffed2f2d098daccdef8a6900ba 100644
--- a/aleksis/core/templates/account/password_reset_from_key.html
+++ b/aleksis/core/templates/account/password_reset_from_key.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% load i18n %}
+{% load i18n material_form %}
 
 {% block browser_title %}{% trans "Change password" %}{% endblock %}
 {% block page_title %}{% trans "Change password" %}{% endblock %}
@@ -30,8 +30,9 @@
     </div>
   {% else  %}
     {% if form %}
-      <form method="post" action="{% url 'account_change_password' %}">
+      <form method="post" action="{{ action_url }}">
         {% csrf_token %}
+        {% form form=form %}{% endform %}
         {% trans "Change password" as caption %}
         {% include "core/partials/save_button.html" with caption=caption icon="priotity_high" %}
       </form>