diff --git a/opentech/apply/urls.py b/opentech/apply/urls.py
index dc692023f0902adc196e545b82b94bfc9360041e..4624990d07ee3a1c64946e9dc6ab25ea614d4217 100644
--- a/opentech/apply/urls.py
+++ b/opentech/apply/urls.py
@@ -5,5 +5,5 @@ from .users import urls as users_urls
 
 urlpatterns = [
     url(r'^apply/', include(funds_urls)),
-    url(r'^user/', include(users_urls, namespace='users')),
+    url(r'^account/', include(users_urls, namespace='users')),
 ]
diff --git a/opentech/apply/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
index 7c17079cba4b01ae7c3a7867037c464e0b6382da..26799c69da341f713f390e9eb7139740fbbb8c1a 100644
--- a/opentech/apply/users/templates/users/change_password.html
+++ b/opentech/apply/users/templates/users/change_password.html
@@ -22,7 +22,6 @@
             {% plural %}
             Please correct the errors below.
             {% endblocktrans %}
-
         </div>
     {% endif %}
 
@@ -30,9 +29,9 @@
         {% csrf_token %}
 
         {% for field in form %}
-         {{ field.errors }}
-         {{ field.label_tag }}
-         {{ field }}
+            {{ field.errors }}
+            {{ field.label_tag }}
+            {{ field }}
         {% endfor %}
 
         <button type="submit">{% trans 'Reset password' %}</button>