diff --git a/public/js/components/ClassSchedule/ClassScheduleOverview.js b/public/js/components/ClassSchedule/ClassScheduleOverview.js
index 50e2d3450..36f87d04f 100644
--- a/public/js/components/ClassSchedule/ClassScheduleOverview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleOverview.js
@@ -320,9 +320,7 @@ export default {
         return getAllClassTimeValidityPeriodsResponse.data.map(
           function (period) {
             period.organisationseinheit_bezeichnung_extended =
-              period.organisationseinheit_bezeichnung +
-              " - " +
-              period.organisationseinheit_organisationseinheittyp_kurzbz;
+              "[" + period.organisationseinheit_organisationseinheittyp_kurzbz + "] " + period.organisationseinheit_bezeichnung;
             if (!period.studienplan_bezeichnung) {
               period.studienplan_bezeichnung = generalWord;
             }
@@ -375,7 +373,7 @@ export default {
     },
     filterOrganizationalUnits(event) {
       let defaultItem = {
-        label: "----------",
+        label: this.$p.t("ui", "dropdownEmptyOption"),
         value: null,
       };
 
@@ -395,7 +393,7 @@ export default {
     },
     filterSemesters(event) {
       let defaultItem = {
-        label: "----------",
+        label: this.$p.t("ui", "dropdownEmptyOption"),
         value: null,
       };
 
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodForm.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodForm.js
index 1b4ca0239..0fdfbefcf 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodForm.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodForm.js
@@ -36,7 +36,7 @@ export default {
           return {
             databaseId: slot.id,
             id: slot.identifier,
-            weekday: slot.wochentag === 0 ? 7 : slot.wochentag,
+            weekday: slot.wochentag + 1,
             type: slot.unterrichtszeitentyp_kurzbz,
             startTime: slot.startTime,
             endTime: slot.endTime,
@@ -88,7 +88,7 @@ export default {
             .unterrichtszeitengueltigkeit_id,
           {
             unterrichtszeiten: this.classTimeSlots.map((slot) => {
-              slot.wochentag = parseInt(slot.wochentag) === 7 ? 0 : slot.wochentag;
+              slot.wochentag = parseInt(slot.wochentag)- 1;
               return slot; 
             }),
           },
@@ -110,7 +110,7 @@ export default {
             .unterrichtszeitengueltigkeit_id,
           {
             unterrichtszeiten: this.classTimeSlots.map((slot) => {
-              slot.wochentag = parseInt(slot.wochentag) === 7 ? 0 : slot.wochentag;
+              slot.wochentag = parseInt(slot.wochentag)- 1;
               return slot;
             }),
           },
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
index a3675a51f..7e38ca882 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodOverview.js
@@ -287,7 +287,7 @@ export default {
                 return {
                   databaseId: slot.id,
                   id: slot.identifier,
-                  weekday: parseInt(slot.wochentag) === 0 ? 7 : slot.wochentag,
+                  weekday: parseInt(slot.wochentag) + 1,
                   type: slot.unterrichtszeitentyp_kurzbz,
                   startTime: slot.uhrzeit_von,
                   endTime: slot.uhrzeit_bis,
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodPreview.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodPreview.js
index 1215a7e55..15f55dae0 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodPreview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodPreview.js
@@ -93,7 +93,7 @@ export default {
               return {
                 databaseId: slot.id,
                 id: slot.identifier,
-                weekday: parseInt(slot.wochentag) === 0 ? 7 : slot.wochentag,
+                weekday: parseInt(slot.wochentag) + 1,
                 type: slot.unterrichtszeitentyp_kurzbz,
                 startTime: slot.uhrzeit_von,
                 endTime: slot.uhrzeit_bis,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cfd6a28b2..110dc78e7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -58656,6 +58656,27 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'dropdownEmptyOption',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '--keine Auswahl--',
+
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '--no selection--',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );