diff --git a/opentech/apply/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
index 00a52621711219b10aaa5c6482331ccfe0224496..7e6551b970734541eff4f066247a869b96ae7e62 100644
--- a/opentech/apply/users/templates/users/change_password.html
+++ b/opentech/apply/users/templates/users/change_password.html
@@ -23,15 +23,15 @@
         </ul>
     {% endif %}
 
-    <form action="{% url 'users:password_change' %}" 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>
 {% endblock %}