diff --git a/helpdesk/templates/registration/logged_out.html b/helpdesk/templates/helpdesk/registration/logged_out.html
similarity index 100%
rename from helpdesk/templates/registration/logged_out.html
rename to helpdesk/templates/helpdesk/registration/logged_out.html
diff --git a/helpdesk/templates/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html
similarity index 100%
rename from helpdesk/templates/registration/login.html
rename to helpdesk/templates/helpdesk/registration/login.html
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 8226ae1b..908d1a02 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -134,11 +134,12 @@ urlpatterns += patterns('',
 
     url(r'^login/$',
         'django.contrib.auth.views.login',
+        {'template_name': 'helpdesk/registration/login.html'},
         name='login'),
 
     url(r'^logout/$',
         'django.contrib.auth.views.logout',
-        {'next_page': '../'},
+        {'template_name': 'helpdesk/registration/login.html', 'next_page': '../'},
         name='logout'),
 )