diff --git a/expenses_manager/expenses/templates/registration/password_change_done.html b/expenses_manager/expenses/templates/registration/password_change_done.html
index 6e67296..3411f85 100644
--- a/expenses_manager/expenses/templates/registration/password_change_done.html
+++ b/expenses_manager/expenses/templates/registration/password_change_done.html
@@ -1,6 +1,13 @@
-{% extends "base.html" %}
+{% extends "expenses/base.html" %}
+
+{% block title %}Contraseña actualizada{% endblock %}
 
 {% block content %}
-    <h2>Contraseña actualizada correctamente</h2>
-    <a href="/">Volver</a>
+    <h1>Contraseña actualizada</h1>
+
+    <p>Tu contraseña se ha cambiado correctamente.</p>
+
+    <div class="form-actions">
+        <a class="btn btn-primary" href="{% url 'home' %}">Volver al inicio</a>
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/expenses_manager/expenses/templates/registration/password_change_form.html b/expenses_manager/expenses/templates/registration/password_change_form.html
index 0145f5a..52494c6 100644
--- a/expenses_manager/expenses/templates/registration/password_change_form.html
+++ b/expenses_manager/expenses/templates/registration/password_change_form.html
@@ -1,10 +1,16 @@
-{% extends "base.html" %}
+{% extends "expenses/base.html" %}
+
+{% block title %}Cambiar contraseña{% endblock %}
 
 {% block content %}
-    <h2>Cambiar contraseña</h2>
-    <form method="post">
+    <h1>Cambiar contraseña</h1>
+
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
-        <button type="submit" class="btn btn-primary">Cambiar</button>
+        {% include "expenses/_form_fields.html" %}
+        <div class="form-actions">
+            <button type="submit" class="btn btn-primary">Cambiar contraseña</button>
+            <a class="btn btn-secondary" href="{% url 'home' %}">Volver</a>
+        </div>
     </form>
 {% endblock %}
\ No newline at end of file