diff --git a/opentech/apply/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
index 178f25355ec310ee23a30bab009fc1665c9e60ec..2903587ae2bd825dd42a4e5683f0d5ee7ac7a17a 100644
--- a/opentech/apply/users/templates/users/change_password.html
+++ b/opentech/apply/users/templates/users/change_password.html
@@ -1,39 +1,40 @@
 {% extends 'base.html' %}
 {% load i18n %}
-
-{% block title %}{% trans "Change password" %}{% endblock %}
-
+{% block header_modifier %}header--light-bg{% endblock %}
+{% block page_title %}Set a password{% endblock %}
+{% block title %}{% trans "Set a password" %}{% endblock %}
 
 {% block content %}
+<div class="wrapper wrapper--small wrapper--bottom-space">
+
     {% if form.non_field_errors %}
-        <div class="messages">
-            <ul>
-                {% for error in form.non_field_errors %}
-                <li class="error">{{ error }}</li>
-                {% endfor %}
-            </ul>
-        </div>
+        <ul class="errorlist">
+            {% for error in form.non_field_errors %}
+                <li>{{ error }}</li>
+            {% endfor %}
+        </ul>
     {% endif %}
 
     {% if form.errors %}
-        <div class="messages">
+        <ul class="errorlist">
             {% blocktrans count counter=form.errors.items|length %}
-            Please correct the error below.
+            <li>Please correct the error below.</li>
             {% plural %}
-            Please correct the errors below.
+            <li>Please correct the errors below.</li>
             {% endblocktrans %}
-        </div>
+        </ul>
     {% endif %}
 
-    <form action="" method="POST" novalidate>
+    <form class="form form--with-p-tags" action="" method="POST" novalidate>
         {% csrf_token %}
 
         {% for field in form %}
             {{ field.errors }}
-            {{ field.label_tag }}
-            {{ field }}
+            <p>{{ field.label_tag }}</p>
+            <p>{{ field }}</p>
         {% endfor %}
 
-        <button type="submit">{% trans 'Reset password' %}</button>
+        <button class="link link--button-secondary" type="submit">{% trans 'Reset password' %}</button>
     </form>
+</div>
 {% endblock %}