diff --git a/marietje/marietje/urls.py b/marietje/marietje/urls.py
index 93377fc..0a5abc2 100644
--- a/marietje/marietje/urls.py
+++ b/marietje/marietje/urls.py
@@ -15,17 +15,17 @@ Including another URLconf
 """
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.contrib.auth.views import LoginView, LogoutView
 from metrics.views import metrics
 from queues.views import index
-from django.contrib.auth.views import login, logout
 from .views import register, activate, forgotpassword, resetpassword
 from .forms import AuthenticationForm
 
 
 urlpatterns = [
     url(r'^$', index, name='index'),
-    url(r'^login/$', login, {'authentication_form': AuthenticationForm}, name='login'),
-    url(r'^logout/$', logout, name='logout'),
+    url(r'^login/$', LoginView.as_view(authentication_form=AuthenticationForm), name='login'),
+    url(r'^logout/$', LogoutView.as_view(), name='logout'),
     url(r'^register/$', register, name='register'),
     url(r'^activate/(\d+)/(\w+)/$', activate, name='activate'),
     url(r'^forgotpassword/$', forgotpassword, name='forgotpassword'),