diff --git a/web/template/admin/admin_tabs/create-course.gohtml b/web/template/admin/admin_tabs/create-course.gohtml
index b988db9aa..3f264af45 100644
--- a/web/template/admin/admin_tabs/create-course.gohtml
+++ b/web/template/admin/admin_tabs/create-course.gohtml
@@ -35,14 +35,14 @@
                     <h2>Manually enter Infos:</h2>
                     <div class="flex space-x-1">
                         <label for="name" class="hidden">Course Title</label>
-                        <input class="w-4/5 tl-input !ml-0" id="name" name="name" type="text"
+                        <input class="w-4/5 tl-input border !ml-0" id="name" name="name" type="text"
                                autocomplete="off"
                                placeholder="Einführung in die Informatik (IN0001)"
                                x-model="title"
                                required
                                :class="title === '' ? 'border-red-500 focus:border-red-500' : ''"/>
                         <label for="slug" class="hidden">Slug</label>
-                        <input class="w-1/5 tl-input" id="slug" name="slug" type="text" x-ref="slug"
+                        <input class="w-1/5 tl-input border" id="slug" name="slug" type="text" x-ref="slug"
                                autocomplete="off"
                                x-model="slug"
                                required
diff --git a/web/template/partial/course/manage/semester-selection.gohtml b/web/template/partial/course/manage/semester-selection.gohtml
index afbd715d1..9f64137f1 100644
--- a/web/template/partial/course/manage/semester-selection.gohtml
+++ b/web/template/partial/course/manage/semester-selection.gohtml
@@ -7,15 +7,21 @@
         <option value="Sommersemester">Sommersemester</option>
     </select>
     <label for="year" class="hidden">teachingTermYear</label>
+
     <div class="flex">
-        <input id="year" x-model="year" name="year" class="w-32 tl-input"
-            :class="year === '' ? 'border-red-500 focus:border-red-500' : ''" placeholder="2022" type="number">
+        <input id="year" x-model="year" x-data="{initialYear: 2022}" name="year" class="w-32 tl-input border"
+               :class="year === '' ? 'border-red-500 focus:border-red-500' : ''"
+               :placeholder="year === '' ? initialYear : ''"
+               type="number"
+               @focus="if (year === '') year = initialYear">
         <template x-if="semester === 'Wintersemester'">
             <div class="flex">
                 <span class="mx-2 my-auto text-3">/</span>
                 <label for="yearW" class="hidden">teachingTermYearW</label>
                 <input id="yearW" x-model="yearW" name="yearW" class="w-16 tl-input"
-                    :class="yearW === '' ? 'border-red-500 focus:border-red-500' : ''" placeholder="23" type="text" readonly disabled>
+                       :class="yearW === '' ? 'border-red-500 focus:border-red-500' : ''"
+                       :placeholder="year === '' ? '23' : ''"
+                       type="text" readonly disabled>
             </div>
         </template>
     </div>