diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index 273ba897..9d471df5 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -42,14 +42,16 @@
                 Hallo {{request.user.username}}
                 <li class=""><a href="/admin">Admin</a></li>
                 <li class=""><a href="{%url 'tasks'%}">Tasks</a></li>
-                <li class=""><a href="{%url 'logout'%}">Logout</a></li>
-            {% else %}
-                <li class=""><a href="{%url 'login'%}">Login</a></li>
             {% endif %}
             <li class=""><a href="{%url 'home'%}">Aktuelles</a></li>
             <li class=""><a href="/fotos">Fotos</a></li>
             <li class=""><a href="/blackboard">Blackboard</a></li>
             <li class=""><a href="{%url 'members'%}">Mitarbeiter</a></li>
+            {% if request.user.is_authenticated %}
+                <li class=""><a href="{%url 'logout'%}">Logout</a></li>
+            {% else %}
+                <li class=""><a href="{%url 'login'%}">Login</a></li>
+            {% endif %}
         </ul>
     </div>