diff --git a/aleksis/core/templates/account/password_change.html b/aleksis/core/templates/account/password_change.html
index fe6723136ce4fded85075268e932314beb57cda9..be331751b31187a792b72cf97a178ddddf4de42b 100644
--- a/aleksis/core/templates/account/password_change.html
+++ b/aleksis/core/templates/account/password_change.html
@@ -3,29 +3,21 @@
 {% load i18n material_form %}
 
 {% block browser_title %}{% trans "Change password" %}{% endblock %}
-{% block no_page_title %}{% endblock %}
+{% block page_title %}{% trans "Change password" %}{% endblock %}
 
 {% block content %}
- <div class="row">
-  <div class="col m1 l2 xl3"></div>
-  <div class="col s12 m10 l8 xl6">
-   <div class="card">
-    <form method="post" action="{% url 'account_change_password' %}">
-     <div class="card-content">
-      <div class="card-title">{% trans "Change password" %}</div>
-       {% csrf_token %}
-       {% form form=form %}{% endform %}
-      </div>
-      <div class="card-action-light">
-       {% trans "Change password" as caption %}
-       {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
-       <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
-        {% trans "Reset password" %}
-       </a>
-      </div>
-     </div>
-    </form>
-   </div>
+  <div class="alert warning">
+    <p>
+      <i class="material-icons left">warning</i>
+      {% trans "Forgot your current password? Click here to reset it:" %} <a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>.
+    </p>
   </div>
- </div>
+
+  <form method="post" action="{% url 'account_change_password' %}">
+    {% csrf_token %}
+    {% form form=form %}{% endform %}
+    {% trans "Change password" as caption %}
+    {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+  </form>
+
 {% endblock %}
diff --git a/aleksis/core/templates/account/password_reset_from_key_done.html b/aleksis/core/templates/account/password_reset_from_key_done.html
index d7c99c3acfdaa56bfdea181279a0ad3f4a6c96e0..b32538e53ee5b1b0f2115e645d0f955d235ba958 100644
--- a/aleksis/core/templates/account/password_reset_from_key_done.html
+++ b/aleksis/core/templates/account/password_reset_from_key_done.html
@@ -9,13 +9,11 @@
   <div class="container">
     <div class="card green">
       <div class="card-content white-text">
-        <div class="card-title">
-          <i class="material-icons small left">success</i>
-          {% blocktrans %}Password changed{% endblocktrans %}
-        </div>
+        <div class="material-icons small left">success</div>
+        <span class="card-title">{% blocktrans %}Password changed!{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
-            Your password is now changed.
+            Your password is now changed!
           {% endblocktrans %}
         </p>
       </div>