diff --git a/nsupdate/accounts/templates/registration/logout.html b/nsupdate/accounts/templates/registration/logout.html
deleted file mode 100644
index 6759e11..0000000
--- a/nsupdate/accounts/templates/registration/logout.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "registration/registration_base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Logged out" %}{% endblock %}
-{% block content %}
-{% trans "Successfully logged out!" %}
-{% endblock %}
diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html
index 8b04564..9bac7b3 100644
--- a/nsupdate/templates/base.html
+++ b/nsupdate/templates/base.html
@@ -58,7 +58,7 @@
                                     {% if request.user.is_staff %}
                                         <li><a href="/admin/">Admin</a></li>
                                     {% endif %}
-                                    <li><a href="{% url 'auth_logout' %}">Logout</a></li>
+                                    <li><a href="{% url 'auth_logout' %}?next={% url 'auth_login' %}">Logout</a></li>
                                 </ul>
                             </li>
                         {% endif %}