diff --git a/opentech/apply/urls.py b/opentech/apply/urls.py
index efd6ba3730e4e45fbe7cae713f3b7ee6870e5183..dc692023f0902adc196e545b82b94bfc9360041e 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'^user/', include(users_urls, namespace='users')),
 ]
diff --git a/opentech/users/templates/users/account.html b/opentech/apply/users/templates/users/account.html
similarity index 100%
rename from opentech/users/templates/users/account.html
rename to opentech/apply/users/templates/users/account.html
diff --git a/opentech/users/templates/users/change_password.html b/opentech/apply/users/templates/users/change_password.html
similarity index 100%
rename from opentech/users/templates/users/change_password.html
rename to opentech/apply/users/templates/users/change_password.html
diff --git a/opentech/users/templates/users/password_reset/complete.html b/opentech/apply/users/templates/users/password_reset/complete.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/complete.html
rename to opentech/apply/users/templates/users/password_reset/complete.html
diff --git a/opentech/users/templates/users/password_reset/confirm.html b/opentech/apply/users/templates/users/password_reset/confirm.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/confirm.html
rename to opentech/apply/users/templates/users/password_reset/confirm.html
diff --git a/opentech/users/templates/users/password_reset/done.html b/opentech/apply/users/templates/users/password_reset/done.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/done.html
rename to opentech/apply/users/templates/users/password_reset/done.html
diff --git a/opentech/users/templates/users/password_reset/email.txt b/opentech/apply/users/templates/users/password_reset/email.txt
similarity index 100%
rename from opentech/users/templates/users/password_reset/email.txt
rename to opentech/apply/users/templates/users/password_reset/email.txt
diff --git a/opentech/users/templates/users/password_reset/form.html b/opentech/apply/users/templates/users/password_reset/form.html
similarity index 100%
rename from opentech/users/templates/users/password_reset/form.html
rename to opentech/apply/users/templates/users/password_reset/form.html
diff --git a/opentech/apply/users/urls.py b/opentech/apply/users/urls.py
index 76e5050bf609c612278e21afceb5e2db07b4d86a..6627da49e1e8f11801d35a30367ce9b744f53b17 100644
--- a/opentech/apply/users/urls.py
+++ b/opentech/apply/users/urls.py
@@ -6,7 +6,7 @@ from django.urls import reverse_lazy
 
 from wagtail.wagtailadmin.forms import PasswordResetForm
 
-from opentech.users.views import account
+from opentech.apply.users.views import account
 
 urlpatterns = [
     url(r'^$', account, name='account'),
diff --git a/opentech/apply/users/views.py b/opentech/apply/users/views.py
index 4ffcd7a58173a0735a541fc2ea92cd0ecae100a5..4524dd218f166e2f4a775e931d578a0df58dca03 100644
--- a/opentech/apply/users/views.py
+++ b/opentech/apply/users/views.py
@@ -3,6 +3,7 @@ from django.shortcuts import render
 
 from wagtail.wagtailadmin.views.account import password_management_enabled
 
+
 @login_required(login_url='/user/login')
 def account(request):
     "Account page placeholder view"