diff --git a/new-registration-app/main.py b/new-registration-app/main.py
index 23c94df..644020e 100644
--- a/new-registration-app/main.py
+++ b/new-registration-app/main.py
@@ -107,7 +107,7 @@ async def read_event(request: Request, event_id: int, session: SessionDep):
     return templates.TemplateResponse(
         request=request,
         name="event.html",
-        context={"event": event, "households": households},
+        context={"event": event, "households": households, "now": datetime.now()},
     )
 
 
diff --git a/new-registration-app/templates/event.html b/new-registration-app/templates/event.html
index 3ee5a01..05517d2 100644
--- a/new-registration-app/templates/event.html
+++ b/new-registration-app/templates/event.html
@@ -20,11 +20,12 @@
 <div class="container">
     <div class="row m-2">
         <div class="col-md-4 d-flex justify-content-center align-items-center flex-column">
+            <p class="text-muted w-100 mb-2">Anmeldung schließt {{ event.registration_deadline.strftime('%A, %d.%m.%Y, %H:%M Uhr') }}</p>
             <!-- Button trigger modal -->
-            <button type="button" class="btn btn-primary mb-2 w-100" data-bs-toggle="modal" data-bs-target="#registration">
+            <button type="button" class="btn btn-primary mb-2 w-100" {% if event.registration_deadline < now %}disabled{% endif%} data-bs-toggle="modal" data-bs-target="#registration">
                 Anmeldung hinzufügen
             </button>
-            <button type="button" class="btn btn-primary mb-2 w-100" {% if event.all_teams_max() %}disabled{% endif %} data-bs-toggle="modal" data-bs-target="#teamRegistration">
+            <button type="button" class="btn btn-primary mb-2 w-100" {% if event.all_teams_max() or event.registration_deadline < now %}disabled{% endif %} data-bs-toggle="modal" data-bs-target="#teamRegistration">
                 Dienst übernehmen
             </button>
             {% if event.recipe_link %}
@@ -162,15 +163,14 @@
                 <div class="modal-body">
                     <p>Wenn dein Haushalt nicht auswählbar ist, existiert schon eine Anmeldung. Wenn du die Anmeldung ändern willst, lösche die bestehende Anmeldung und lege eine neue an.</p>
                     <div class="mb-3">
-                        <select name="household" class="form-select" aria-label="Multiple select example">
-                            <option selected>Wer?</option>
+                        <select name="household" class="form-select" aria-label="Multiple select example" required>
+                            <option value="" disabled selected hidden>Wer?</option>
                             {% for household in households %}
                             <option value="{{household.id}}">{{household.name}}</option>
                             {% endfor %}
                         </select>
                     </div>
 
-
                     <div class="row">
                         <div class="col">
                             <label for="InputAdults" class="form-label">Anzahl Erwachsene</label>