diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
index ddee7516b..2cc450125 100644
--- a/passbook/core/templates/overview/base.html
+++ b/passbook/core/templates/overview/base.html
@@ -48,7 +48,7 @@
           </li>
           <li class="divider"></li>
           <li>
-            <a href="#0">One more separated link</a>
+            <a href="{% url 'passbook_core:auth-logout' %}">{% trans 'Logout' %}</a>
           </li>
         </ul>
       </li>
diff --git a/passbook/core/urls.py b/passbook/core/urls.py
index 3376ce9ce..14c3f7b5e 100644
--- a/passbook/core/urls.py
+++ b/passbook/core/urls.py
@@ -15,6 +15,7 @@ admin.site.login = RedirectView.as_view(pattern_name='passbook_core:auth-login')
 
 core_urls = [
     path('auth/login/', authentication.LoginView.as_view(), name='auth-login'),
+    path('auth/logout/', authentication.LogoutView.as_view(), name='auth-logout'),
     path('', overview.OverviewView.as_view(), name='overview'),
 ]
 
diff --git a/passbook/core/views/authentication.py b/passbook/core/views/authentication.py
index f2219f414..76d23dc4f 100644
--- a/passbook/core/views/authentication.py
+++ b/passbook/core/views/authentication.py
@@ -3,11 +3,12 @@ from logging import getLogger
 from typing import Dict
 
 from django.contrib import messages
-from django.contrib.auth import authenticate, login
-from django.contrib.auth.mixins import UserPassesTestMixin
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, reverse
 from django.utils.translation import ugettext as _
+from django.views import View
 from django.views.generic import FormView
 
 from passbook.core.forms.authentication import LoginForm
@@ -45,7 +46,7 @@ class LoginView(UserPassesTestMixin, FormView):
         pre_user = self.get_user(form.cleaned_data.get('uid_field'))
         if not pre_user:
             # No user found
-            return LoginView.invalid_login(self.request)
+            return self.invalid_login(self.request)
         user = authenticate(
             email=pre_user.email,
             username=pre_user.username,
@@ -53,12 +54,11 @@ class LoginView(UserPassesTestMixin, FormView):
             request=self.request)
         if user:
             # User authenticated successfully
-            return LoginView.login(self.request, user, form.cleaned_data)
+            return self.login(self.request, user, form.cleaned_data)
         # User was found but couldn't authenticate
-        return LoginView.invalid_login(self.request, disabled_user=pre_user)
+        return self.invalid_login(self.request, disabled_user=pre_user)
 
-    @staticmethod
-    def login(request: HttpRequest, user: User, cleaned_data: Dict) -> HttpResponse:
+    def login(self, request: HttpRequest, user: User, cleaned_data: Dict) -> HttpResponse:
         """Handle actual login
 
         Actually logs user in, sets session expiry and redirects to ?next parameter
@@ -86,17 +86,16 @@ class LoginView(UserPassesTestMixin, FormView):
         # Otherwise just index
         return redirect(reverse('passbook_core:overview'))
 
-    @staticmethod
-    def invalid_login(request: HttpRequest, disabled_user: User = None) -> HttpResponse:
+    def invalid_login(self, request: HttpRequest, disabled_user: User = None) -> HttpResponse:
         """Handle login for disabled users/invalid login attempts"""
-        # if disabled_user:
-        #     context = {
-        #         'reason': 'disabled',
-        #         'user': disabled_user
-        #     }
-        # else:
-        #     context = {
-        #         'reason': 'invalid',
-        #     }
-        raise NotImplementedError()
-        # return render(request, 'login/invalid.html', context)
+        messages.error(request, _('Failed to authenticate.'))
+        return self.render_to_response(self.get_context_data())
+
+class LogoutView(LoginRequiredMixin, View):
+    """Log current user out"""
+
+    def dispatch(self, request):
+        """Log current user out"""
+        logout(request)
+        messages.success(request, _("You've successfully been logged out."))
+        return redirect(reverse('passbook_core:auth-login'))