diff --git a/rowers/templates/base.html b/rowers/templates/base.html
index 48b6fde5..061b6252 100644
--- a/rowers/templates/base.html
+++ b/rowers/templates/base.html
@@ -38,7 +38,7 @@
 			{% if user.is_authenticated %}
 			<p><a class="button gray small" href="/password_change/">Password Change</a></p>
 			{% else %}
-			<p><a class="button gray small" href="/password_reset/">Forgotten Password?</a></p>
+			<p><a class="button gray small" href="/password_reset/">Forgot Password?</a></p>
 			{% endif %}
 			</div>
 		</div>
diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html
index f37b61a4..41550cc7 100644
--- a/rowers/templates/registration/login.html
+++ b/rowers/templates/registration/login.html
@@ -17,10 +17,14 @@
     <td>{{ form.password.label_tag }}</td>
     <td>{{ form.password }}</td>
 </tr>
+<tr>
+  <td></td>
+  <td><a href="/password_reset/">Forgot password?</a></td>
+  </tr>
 </table>
 
 <input type="submit" value="login" />
 <input type="hidden" name="next" value="{{ next }}" />
 </form>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 02751a8a..b71ea960 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -39,15 +39,15 @@ ALLOWED_HOSTS = CFG['allowed_hosts']
 # Application definition
 
 INSTALLED_APPS = [
+    'rowers',
+    'cvkbrno',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'rowers',
-    'cvkbrno',
-    'django_rq',
+     'django_rq',
     'django_rq_dashboard',
     'translation_manager',
 #    'debug_toolbar',
diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py
index 8d589ee1..92371cd4 100644
--- a/rowsandall_app/urls.py
+++ b/rowsandall_app/urls.py
@@ -21,21 +21,28 @@ from rowsandall_app.views import rootview
 from django.contrib.auth import views as auth_views
 from rowers import views as rowersviews
 
-
 urlpatterns = [
+    url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
+    url(r'^password_change/$',auth_views.password_change),
+    url(r'^password_reset/$', auth_views.password_reset, name='password_reset'),
+    url(r'^password_reset/done/$', auth_views.password_reset_done,name='password_reset_done'),
+    url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)-(?P<token>.+)/$', auth_views.password_reset_confirm),
+    url(r'^reset/done/$', auth_views.password_reset_complete,
+        name='password_reset_complete'),
+    ]
+
+urlpatterns += [
     url(r'^admin/', admin.site.urls),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^$',rootview),
     url(r'^login/',auth_views.login, name='login'),
     url(r'^logout/',auth_views.logout_then_login,name='logout'),
-    url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
-    url(r'^password_change/',auth_views.password_change),
-    url(r'^password_reset/$',auth_views.password_reset,name='password_reset'),
-    url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'),
-    url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'),
-    url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'),
-    url(r'^password_reset_complete/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'),
-    url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'),
+#    url(r'^password_reset/$',auth_views.password_reset,name='password_reset'),
+#    url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'),
+#    url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'),
+#    url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'),
+#    url(r'^password_reset_complete/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'),
+#    url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'),
     url(r'^rowers/',include('rowers.urls')),
     url(r'^cvkbrno/',include('cvkbrno.urls')),
     url(r'^admin/rq/',include('django_rq_dashboard.urls')),