diff --git a/ivatar/ivataraccount/templates/login.html b/ivatar/ivataraccount/templates/login.html
index b0abae8..061c17d 100644
--- a/ivatar/ivataraccount/templates/login.html
+++ b/ivatar/ivataraccount/templates/login.html
@@ -7,6 +7,15 @@
 
 <h1>{% trans 'Login' %}</h1>
 
+{% if form.errors %}
+    {% for error in form.non_field_errors %}
+        <div class="alert alert-danger">
+            <strong>{{ error|escape }}</strong>
+        </div>
+    {% endfor %}
+{% endif %}
+
+
 <form action="{% url 'login' %}" method="post" name="login">{% csrf_token %}
 
 <table summary="">
diff --git a/ivatar/ivataraccount/urls.py b/ivatar/ivataraccount/urls.py
index 785b5d3..afaefdf 100644
--- a/ivatar/ivataraccount/urls.py
+++ b/ivatar/ivataraccount/urls.py
@@ -2,6 +2,9 @@ from django.urls import path
 from django.conf.urls import url
 
 from django.views.generic import TemplateView
+from django.contrib.auth.views import LoginView, LogoutView
+from django.contrib.auth.decorators import login_required
+
 from . views import CreateView, PasswordSetView, AddEmailView
 from . views import RemoveUnconfirmedEmailView, ConfirmEmailView
 from . views import RemoveConfirmedEmailView, AssignPhotoEmailView
@@ -10,19 +13,16 @@ from . views import ImportPhotoView, RawImageView, DeletePhotoView
 from . views import UploadPhotoView, AssignPhotoOpenIDView
 from . views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView
 from . views import CropPhotoView
-from django.contrib.auth.views import login, logout
-from django.urls import reverse_lazy
-
-from django.contrib.auth.decorators import login_required
 
 # Define URL patterns, self documenting
 # To see the fancy, colorful evaluation of these use:
 # ./manager show_urls
 urlpatterns = [
     path('new/', CreateView.as_view(), name='new_account'),
-    path('login/', login, {'template_name': 'login.html'}, name='login'),
+    path('login/', LoginView.as_view(template_name='login.html'),
+         name='login'),
     path(
-        'logout/', logout, {'next_page': reverse_lazy('login')},
+        'logout/', LogoutView.as_view(next_page='/'),
         name='logout'),
     path('export/', login_required(
         TemplateView.as_view(template_name='export.html')