diff --git a/templating/templates/addMask.html b/templating/templates/addMask.html
index ab7ed6a..e5a5e0d 100644
--- a/templating/templates/addMask.html
+++ b/templating/templates/addMask.html
@@ -35,6 +35,7 @@
 
       <div class="form-floating mb-3">
         <select class="form-control form-select required" required name="veranstaltung" id="veranstaltung">
+          <option disabled{{if eq $.SelectedCourse 0 }} selected{{end}} value>–– auswählen ––</option>
           {{range $course := .Courses}}
           <option value="{{$course.Id}}"{{if eq $course.Id $.SelectedCourse}} selected{{end}}>{{$course.Name}}</option>
           {{end}}
@@ -102,6 +103,7 @@
 
           <div class="form-floating mb-3">
             <select class="form-control form-select required" required name="raum" id="raum">
+              <option disabled{{if eq $.SelectedRoom 0 }} selected{{end}} value>–– auswählen ––</option>
               {{range $room := .Rooms}}
               <option value="{{$room.Id}}"{{if eq $room.Id $.SelectedRoom}} selected{{end}}>{{$room.Name}}</option>
               {{end}}
diff --git a/templating/templates/index.html b/templating/templates/index.html
index 007b0a7..683028b 100644
--- a/templating/templates/index.html
+++ b/templating/templates/index.html
@@ -14,7 +14,7 @@ Sprechstunden
     <div class="input-group mb-3">
       <div class="form-floating col-lg-8">
         <select class="form-control form-select" name="veranstaltung" id="veranstaltung" size="1" onchange="document.forms[0].submit()">
-          <option value="">–– auswählen ––</option>
+          <option disabled selected value>–– auswählen ––</option>
           {{range $course := .Courses}}
           <option value="{{$course.Id}}"{{if eq $course.Id $.SelectedCourse}} selected{{end}}>{{$course.Name}}</option>
           {{end}}
@@ -30,7 +30,7 @@ Sprechstunden
     <div class="input-group mb-3">
       <div class="form-floating">
         <select class="form-control form-select" name="raum" id="raum" size="1" onchange="document.forms[1].submit()">
-          <option value="">–– auswählen ––</option>
+          <option disabled selected value>–– auswählen ––</option>
           {{range $room := .Rooms}}
           <option value="{{$room.Id}}"{{if eq $room.Id $.SelectedRoom}} selected{{end}}>{{$room.Name}}</option>
           {{end}}