diff --git a/dav_registration/templates/dav_registration/event_list.html b/dav_registration/templates/dav_registration/event_list.html
index a971e50..83c7f1c 100644
--- a/dav_registration/templates/dav_registration/event_list.html
+++ b/dav_registration/templates/dav_registration/event_list.html
@@ -30,6 +30,8 @@
                         {% elif event.is_deadline_expired %}
                         <span class="text-danger"><span class="glyphicon glyphicon-time"></span></span>
                         <span class="text-danger"><strong>{% trans 'Anmeldeschluss abgelaufen' %}</strong></span>
+                        {% elif not event.registration_required %}
+                        <a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'Details' %} - {% trans 'keine Anmeldung nötig' %}</a>
                         {% else %}
                         <a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'Details & Anmeldung' %}</a>
                         {% endif %}
@@ -63,7 +65,15 @@
                                 </li>
                                 {% if not event.registration_closed and not event.is_deadline_expired %}
                                 <li class="list-group-item">
-                                    <a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'zur Anmeldung' %}</a>
+                                    {% if not event.registration_required %}
+                                    <div class="alert alert-info">
+                                        {% blocktrans %}
+                                        Zu dieser Veranstaltung ist keine Anmeldung notwendig.<br />
+                                        Du kannst das Anmeldeformular natürlich trotzdem ausfüllen.
+                                        {% endblocktrans %}
+                                    </div>
+                                    {% endif %}
+                                    <a class="btn btn-primary" href="{% url 'dav_registration:register' event.pk %}">{% trans 'zur Anmeldung' %}</a>
                                 </li>
                                 {% endif %}
                             </ul>