diff --git a/controllers/addOfficeHourHandler.go b/controllers/addOfficeHourHandler.go
index 20c3b8d..4e498e1 100644
--- a/controllers/addOfficeHourHandler.go
+++ b/controllers/addOfficeHourHandler.go
@@ -73,8 +73,8 @@ func (b *BaseHandler) AddOfficeHourHandler(w http.ResponseWriter, req *http.Requ
 	if err != nil {
 		errors = append(errors, "Die Vorlesungswoche muss eine ganze Zahl sein.")
 	}
-	if !(week >= 0 && week <= 2) {
-		errors = append(errors, "Sprechstunden müssen jede, jede gerade oder jede ungerade Vorlesungswoche stattfinden.")
+	if !(week >= 0 && week <= 5) {
+		errors = append(errors, "Bitte wähle eine der vorgegebenen Optionen für Vorlesungswochen.")
 	}
 	day, err := strconv.Atoi(req.FormValue("tag"))
 	if err != nil {
diff --git a/models/date.go b/models/date.go
index 61ce6a3..bea4dc4 100644
--- a/models/date.go
+++ b/models/date.go
@@ -5,7 +5,7 @@ import (
 )
 
 type Date struct {
-	Week   int // Set whether the date is all weeks (0), odd weeks (1) or even weeks (2).
+	Week   int // Set whether the date is all weeks (0), weeks with exercise session (1) or weeks without exercise session (2), even weeks (3), odd weeks (4) or other (5).
 	Day    int
 	Hour   int
 	Minute int
diff --git a/repositories/officeHour.go b/repositories/officeHour.go
index 27ccd86..4a0243a 100644
--- a/repositories/officeHour.go
+++ b/repositories/officeHour.go
@@ -245,9 +245,7 @@ func (r *OfficeHourRepo) NumberByTimeSpanAndRoom(date models.Date, duration int,
 		for _, officeHour := range officeHours {
 			// increase count if officehour starts before this point in time and ends later
 			if models.DateLess(officeHour.Date, models.GetEndDate(date, minute, false)) && models.DateLess(models.GetEndDate(date, minute, false), models.GetEndDate(officeHour.Date, officeHour.Duration, false)) {
-				if date.Week == 0 || officeHour.Week == 0 || date.Week == officeHour.Week { // office hours in alternating weeks should not collide
-					minuteCount += 1
-				}
+				minuteCount += 1
 			}
 		}
 		if minuteCount > count {
diff --git a/templating/templates/addMask.html b/templating/templates/addMask.html
index 98152d7..eda37d7 100644
--- a/templating/templates/addMask.html
+++ b/templating/templates/addMask.html
@@ -59,9 +59,12 @@
 
           <div class="form-floating mb-3">
             <select class="form-control form-select required" required name="woche" id="woche">
-              <option value="0"{{if eq 0 $.Date.Week}} selected{{end}}>Jede</option>
-              <option value="1"{{if eq 1 $.Date.Week}} selected{{end}}>Ungerade</option>
-              <option value="2"{{if eq 2 $.Date.Week}} selected{{end}}>Gerade</option>
+              <option value="0"{{if eq 0 $.Date.Week}} selected{{end}}>Jede Woche</option>
+              <option value="1"{{if eq 1 $.Date.Week}} selected{{end}}>In Wochen mit Übung</option>
+              <option value="2"{{if eq 2 $.Date.Week}} selected{{end}}>In Wochen ohne Übung</option>
+              <option value="1"{{if eq 3 $.Date.Week}} selected{{end}}>In geraden Vorlesungswochen</option>
+              <option value="2"{{if eq 4 $.Date.Week}} selected{{end}}>In ungeraden Vorlesungswochen</option>
+              <option value="2"{{if eq 5 $.Date.Week}} selected{{end}}>Etwas anderes (nutze Infofeld)</option>
             </select>
             <label for="woche">Vorlesungswoche</label>
           </div>
diff --git a/templating/templates/confirmationMail b/templating/templates/confirmationMail
index 30205e1..1d61fdb 100644
--- a/templating/templates/confirmationMail
+++ b/templating/templates/confirmationMail
@@ -5,6 +5,7 @@ mit deiner Emailadresse soll eine Sprechstunde mit folgenden Daten {{if eq .Requ
 {{.Request.OfficeHour.Course.Name}}
 {{DayName .Request.OfficeHour.Date.Day}}
 {{printf "%02d" .Request.OfficeHour.Date.Hour}}:{{printf "%02d" .Request.OfficeHour.Date.Minute}} Uhr bis {{printf "%02d" .Request.OfficeHour.EndDate.Hour}}:{{printf "%02d" .Request.OfficeHour.EndDate.Minute}} Uhr
+{{if eq 0 .Request.OfficeHour.Date.Week}}Jede Woche{{end}}{{if eq 1 .Request.OfficeHour.Date.Week}}In Wochen mit Übung{{end}}{{if eq 2 .Request.OfficeHour.Date.Week}}In Wochen ohne Übung{{end}}{{if eq 3 .Request.OfficeHour.Date.Week}}In geraden Vorlesungswochen{{end}}{{if eq 4 .Request.OfficeHour.Date.Week}}In ungeraden Vorlesungswochen{{end}}
 {{.Request.OfficeHour.Tutor.Name}}
 {{.Request.OfficeHour.Room.Name}}
 
diff --git a/templating/templates/deleteMailForm.html b/templating/templates/deleteMailForm.html
index 378e6e7..11a8119 100644
--- a/templating/templates/deleteMailForm.html
+++ b/templating/templates/deleteMailForm.html
@@ -11,7 +11,7 @@
   <p>
     Willst du die Sprechstunde<br>
     {{printf "%02d" .OfficeHour.Date.Hour}}:{{printf "%02d" .OfficeHour.Date.Minute}} - {{printf "%02d" .OfficeHour.EndDate.Hour}}:{{printf "%02d" .OfficeHour.EndDate.Minute}}<br>
-    {{if eq .OfficeHour.Date.Week 1}}in ungeraden Vorlesungswochen<br>{{end}}{{if eq .OfficeHour.Date.Week 2}}in geraden Vorlesungswochen<br>{{end}}
+    {{if eq 0 $.Date.Week}}>Jede Woche<br>{{end}}{{if eq 1 $.Date.Week}}In Wochen mit Übung<br>{{end}}{{if eq 2 $.Date.Week}}In Wochen ohne Übung<br>{{end}}{{if eq 3 $.Date.Week}}In geraden Vorlesungswochen<br>{{end}}{{if eq 4 $.Date.Week}}In ungeraden Vorlesungswochen<br>{{end}}
     {{.OfficeHour.Course.Name}}<br>
     {{.OfficeHour.Tutor.Name}}<br>
     {{.OfficeHour.Room.Name}}<br>
diff --git a/templating/templates/td.html b/templating/templates/td.html
index cb1f041..76fc5e1 100644
--- a/templating/templates/td.html
+++ b/templating/templates/td.html
@@ -1,7 +1,7 @@
 <td class="officeHour" rowspan="{{divide .OfficeHour.Duration .MinuteGranularity}}">
   {{if .DeleteIcons}}<div style="text-align: right;"><a href="/deleteOfficeHour?id={{.OfficeHour.Id}}">❌</a></div>{{end}}
   {{printf "%02d" .OfficeHour.Date.Hour}}:{{printf "%02d" .OfficeHour.Date.Minute}} - {{printf "%02d" .OfficeHour.EndDate.Hour}}:{{printf "%02d" .OfficeHour.EndDate.Minute}}<br>
-  {{if eq .OfficeHour.Date.Week 1}}in ungeraden Vorlesungswochen<br>{{end}}{{if eq .OfficeHour.Date.Week 2}}in geraden Vorlesungswochen<br>{{end}}
+  {{if eq 1 .OfficeHour.Date.Week}}In Wochen mit Übung<br>{{end}}{{if eq 2 .OfficeHour.Date.Week}}In Wochen ohne Übung<br>{{end}}{{if eq 3 .OfficeHour.Date.Week}}In geraden Vorlesungswochen<br>{{end}}{{if eq 4 .OfficeHour.Date.Week}}In ungeraden Vorlesungswochen<br>{{end}}
   {{.OfficeHour.Course.Name}}<br>
   {{.OfficeHour.Tutor.Name}}<br>
   {{.OfficeHour.Room.Name}}