diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 1a739510..c4025c05 100644
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -56,6 +56,34 @@ pre {
     color: #999;
 }
 
+ul.dropdown-menu > li > form {
+    display: block;
+    width: 100%;
+}
+
+ul.dropdown-menu > li > form > button {
+    /* taken from bootstrap's styling for '.dropdown-menu > li > a' */
+    background: none;
+    border: none;
+    cursor: pointer;
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: 400;
+    line-height: 1.42857143;
+    color: #333;
+    white-space: nowrap;
+    width: 100%;
+    text-align: left;
+}
+
+ul.dropdown-menu > li > form > button:hover {
+    /* taken from bootstrap's styling for '.dropdown-menu > li > a:hover' */
+    color: #262626;
+    text-decoration: none;
+    background-color: #f5f5f5;
+}
+
 form {
     padding: 0em;
     margin: 0em;
diff --git a/templates/base.html b/templates/base.html
index 747da592..9519ecc5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -93,7 +93,12 @@
                 <li><a href="{% url 'admin:index' %}">Administration</a></li>
 {% endif %}
                 <li><a href="{% url 'user-profile' %}">View profile</a></li>
-                <li><a href="{% url 'auth_logout' %}">Logout</a></li>
+                <li>
+                  <form id="logout-form" method="post" action="{% url 'auth_logout' %}">
+                    {% csrf_token %}
+                    <button type="submit">Logout</button>
+                  </form>
+                </li>
               </ul>
             </li>
 {% else %}