diff --git a/opentech/apply/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
index 02e74a0779fe677664d97dafabf40ed1b60283f1..ba6419db4311229e6748f2e098ded299657fe6cc 100644
--- a/opentech/apply/users/templates/users/change_password.html
+++ b/opentech/apply/users/templates/users/change_password.html
@@ -5,36 +5,33 @@
 {% block title %}{% trans "Set a password" %}{% endblock %}
 
 {% block content %}
-<div class="wrapper wrapper--small wrapper--bottom-space">
+<div class="wrapper wrapper--small wrapper--inner-space-medium">
+    <form class="form" action="" method="POST" novalidate>
+        {% if form.non_field_errors %}
+            <ul class="errorlist">
+                {% for error in form.non_field_errors %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
 
-    {% if form.non_field_errors %}
-        <ul class="errorlist">
-            {% for error in form.non_field_errors %}
-                <li>{{ error }}</li>
-            {% endfor %}
-        </ul>
-    {% endif %}
+        {% if form.errors %}
+            <ul class="errorlist">
+                {% blocktrans count counter=form.errors.items|length %}
+                <li>Please correct the error below.</li>
+                {% plural %}
+                <li>Please correct the errors below.</li>
+                {% endblocktrans %}
+            </ul>
+        {% endif %}
 
-    {% if form.errors %}
-        <ul class="errorlist">
-            {% blocktrans count counter=form.errors.items|length %}
-            <li>Please correct the error below.</li>
-            {% plural %}
-            <li>Please correct the errors below.</li>
-            {% endblocktrans %}
-        </ul>
-    {% endif %}
-
-    <form class="form form--with-p-tags" action="" method="POST" novalidate>
         {% csrf_token %}
 
         {% for field in form %}
-            {{ field.errors }}
-            <p>{{ field.label_tag }}</p>
-            <p>{{ field }}</p>
+            {% include "funds/includes/field.html" %}
         {% endfor %}
 
-        <button class="link link--button-secondary" type="submit">{% trans 'Reset password' %}</button>
+        <button class="button button--primary" type="submit">{% trans 'Reset password' %}</button>
     </form>
 </div>
 {% endblock %}