diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index c319fc3d..52c56c87 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -65,10 +65,14 @@
                 <h2>Agenda</h2>
                 {{ post.agenda_html|safe }}
                 <hr>
+            {% elif post.body %}
+                {{ post.body|safe|add_internal_links|tags_to_url }}
+                <hr>
             {% endif %}
 
-            {% if post.body and post.body != "None" %}
-                {{ post.body|safe|add_internal_links|tags_to_url }}
+            {% if request.user.is_authenticated and post.has_protocol %}
+                <h2>Protokoll</h2>
+                {{ post.protocol_html|safe }}
                 <hr>
             {% endif %}