diff --git a/src/newsreader/accounts/templates/accounts/views/login.html b/src/newsreader/accounts/templates/accounts/views/login.html
index 333e02d..b4c391d 100644
--- a/src/newsreader/accounts/templates/accounts/views/login.html
+++ b/src/newsreader/accounts/templates/accounts/views/login.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
 
-{% load static %}
-
 {% block content %}
   <main id="login--page" class="main">
     {% include "accounts/components/login-form.html" with form=form title="Login" confirm_text="Login" %}
diff --git a/src/newsreader/accounts/templates/accounts/views/password-change.html b/src/newsreader/accounts/templates/accounts/views/password-change.html
index 1ece1dd..5f7b852 100644
--- a/src/newsreader/accounts/templates/accounts/views/password-change.html
+++ b/src/newsreader/accounts/templates/accounts/views/password-change.html
@@ -1,22 +1,8 @@
 {% extends "base.html" %}
-{% load static i18n %}
 
 {% block content %}
-<main class="main">
-  <form class="form password-change-form" method="post">
-    {% csrf_token %}
-
-    <div class="form__header">
-      <h1 class="h1 form__title">{% trans "Password change" %}</h1>
-    </div>
-
-    <fieldset class="fieldset password-change-form__fieldset">
-      {{ form }}
-    </fieldset>
-    <fieldset class="fieldset password-reset-form__fieldset">
-      <a class="button button--cancel" href="{% url 'accounts:settings' %}">Cancel</a>
-      <button class="button button--confirm" type="submit">Change</button>
-    </fieldset>
-  </form>
-</main>
+  <main class="main">
+    {% url 'accounts:settings' as cancel_url %}
+    {% include "components/form/form.html" with form=form title="Change password" confirm_text="Change password" cancel_url=cancel_url %}
+  </main>
 {% endblock %}