diff --git a/backend/service/addRoute.go b/backend/service/addRoute.go
index b5991c3..a9fa997 100644
--- a/backend/service/addRoute.go
+++ b/backend/service/addRoute.go
@@ -34,7 +34,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
-				//apis.RequireAdminAuth(),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {
@@ -56,7 +56,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
-				//apis.RequireAdminAuth(),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {
@@ -79,7 +79,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
-				//apis.RequireAdminAuth(),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {
diff --git a/backend/service/fetch/v1/fetchSeminarEventService.go b/backend/service/fetch/v1/fetchSeminarEventService.go
index eace23c..6228ca6 100644
--- a/backend/service/fetch/v1/fetchSeminarEventService.go
+++ b/backend/service/fetch/v1/fetchSeminarEventService.go
@@ -8,6 +8,7 @@ import (
 	"htwkalender/model"
 	"htwkalender/service/date"
 	"htwkalender/service/fetch"
+	"htwkalender/service/functions"
 	"regexp"
 	"strconv"
 	"strings"
@@ -17,7 +18,7 @@ import (
 func ReplaceEmptyEventNames(groups []model.SeminarGroup) []model.SeminarGroup {
 	for i, group := range groups {
 		for j, event := range group.Events {
-			if event.Name == "" {
+			if functions.OnlyWhitespace(event.Name) {
 				groups[i].Events[j].Name = "Sonderveranstaltungen"
 			}
 		}
diff --git a/frontend/src/view/CourseSelection.vue b/frontend/src/view/CourseSelection.vue
index ced5812..7d898bf 100644
--- a/frontend/src/view/CourseSelection.vue
+++ b/frontend/src/view/CourseSelection.vue
@@ -72,14 +72,6 @@ getCourses();
     }"
   >
     <template #selection="{ flexSpecs }">
-      <Dropdown
-        v-model="selectedSemester"
-        :options="semesters"
-        :class="flexSpecs"
-        option-label="name"
-        :placeholder="$t('courseSelection.semesterDropDown')"
-        @change="getCourses()"
-      ></Dropdown>
       <Dropdown
         v-model="selectedCourse"
         :options="courses"
@@ -91,6 +83,14 @@ getCourses();
         :auto-filter-focus="true"
         @change="getModules()"
       ></Dropdown>
+      <Dropdown
+        v-model="selectedSemester"
+        :options="semesters"
+        :class="flexSpecs"
+        option-label="name"
+        :placeholder="$t('courseSelection.semesterDropDown')"
+        @change="getCourses()"
+      ></Dropdown>
     </template>
     <template #content>
       <ModuleSelection