diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 71b75ce7aff77be306e35979390387ec563fe580..edf529b4ce4e0232104cf5dcf4833c1c0b1e709a 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -477,7 +477,7 @@ class Admin_CoursesController extends AuthenticatedController
 
             $data = [];
             foreach ($courses as $course_id => $course) {
-                $course_model = Course::buildExisting($course);
+                $course_model = Course::find($course_id);
                 $sem = new Seminar($course_model);
                 $row = [];
 
@@ -486,7 +486,7 @@ class Admin_CoursesController extends AuthenticatedController
                 }
 
                 if (in_array('name', $filter_config)) {
-                    $row['name'] = $course['Name'];
+                    $row['name'] = $course_model->name;
                 }
 
                 if (in_array('type', $filter_config)) {
@@ -542,7 +542,7 @@ class Admin_CoursesController extends AuthenticatedController
                 foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
                     foreach ($plugin->adminAvailableContents() as $index => $label) {
                         if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) {
-                            $content = $plugin->adminAreaGetCourseContent(Course::find($course_id), $index);
+                            $content = $plugin->adminAreaGetCourseContent($course_model, $index);
                             $row[$plugin->getPluginId() . "_" . $index] = strip_tags(is_a($content, 'Flexi_Template')
                                 ? $content->render()
                                 : $content
diff --git a/app/views/admin/courses/_course.php b/app/views/admin/courses/_course.php
index 645b06e7443e0763ac888430a95354e20f215b3b..e12d31a16d3c60d102fb82019d458677ea4eb12a 100644
--- a/app/views/admin/courses/_course.php
+++ b/app/views/admin/courses/_course.php
@@ -55,7 +55,7 @@ if (!$values['parent_course'] || !in_array($values['parent_course'], array_keys(
                 <? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
                 <a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $semid]) ?>">
                     <? endif ?>
-                    <?= htmlReady(trim($values['Name'])) ?>
+                    <?= htmlReady($course->name) ?>
                     <? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
                 </a>
             <? endif ?>