diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py
index 282f81c1..4aeaf079 100644
--- a/fet2020/posts/forms.py
+++ b/fet2020/posts/forms.py
@@ -218,6 +218,10 @@ class FetMeetingCreateForm(forms.ModelForm):
         model = FetMeeting
         fields = ["event_start", "event_end", "event_place"]
 
+        help_texts = {
+            "event_end": "Bei leeren Eingabe werden 2h zur Startzeit dazugezählt.",
+        }
+
         labels = {
             "event_start": "Start der Sitzung",
             "event_end": "Ende der Sitzung",
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index 68269d57..0b5a3abc 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -270,7 +270,13 @@ class FetMeetingCreateView(LoginRequiredMixin, CreateView):
             q.update({"event_start": f"{event_start_0} {event_start_1}"})
 
             event_end_0 = q.pop("event_end_0")[0]
+            if not event_end_0:
+                event_end_0 = event_start_0
+
             event_end_1 = q.pop("event_end_1")[0]
+            if not event_end_1:
+                event_end_1 = event_start_1 + timedelta(hours=2)
+
             q.update({"event_end": f"{event_end_0} {event_end_1}"})
 
             q._mutable = _mutable
diff --git a/fet2020/templates/baseform/date_time.html b/fet2020/templates/baseform/date_time.html
index 7935f829..2d114bfe 100644
--- a/fet2020/templates/baseform/date_time.html
+++ b/fet2020/templates/baseform/date_time.html
@@ -1,5 +1,5 @@
 <label>
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }}</span>
+    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>