diff --git a/app/controllers/course/enrolment.php b/app/controllers/course/enrolment.php
index a9ca3516bf62a0f4a5db4b2f8b6c71a59f84f46b..275620d3dda34edf6db0d653b6d2dbff3ac13c70 100644
--- a/app/controllers/course/enrolment.php
+++ b/app/controllers/course/enrolment.php
@@ -74,7 +74,8 @@ class Course_EnrolmentController extends AuthenticatedController
             $this->relocate(URLHelper::getLink('dispatch.php/course/details', ['sem_id' => $this->course_id]));
             return;
         }
-
+        $this->admission_error = '';
+        $this->admission_form = '';
         $this->course = Course::find($this->course_id);
 
         try {
diff --git a/app/views/course/enrolment/apply.php b/app/views/course/enrolment/apply.php
index 54a1ff35f7b6d93a7db8df1c7cbe4106bcbc7fa5..531a5525b036faba02948d5479ad638ea954a1b2 100644
--- a/app/views/course/enrolment/apply.php
+++ b/app/views/course/enrolment/apply.php
@@ -17,7 +17,7 @@
         </div>
         <?= CSRFProtection::tokenTag() ?>
     </form>
-<? elseif ($priocourses): ?>
+<? elseif (!empty($priocourses)): ?>
     <form name="claim_admission" action="<?= $controller->action_link("claim/{$course_id}") ?>" method="post" class="default">
     <? if (is_array($priocourses)): ?>
         <?= $this->render_partial('course/enrolment/_priocourses.php') ?>
diff --git a/app/views/my_courses/_exportcourse.php b/app/views/my_courses/_exportcourse.php
index b198fd21a80e6855f62f64c111e1eb52f324b61d..cfd0815b330049a57d935b9955faf4a432e60e47 100644
--- a/app/views/my_courses/_exportcourse.php
+++ b/app/views/my_courses/_exportcourse.php
@@ -44,7 +44,7 @@
 <th><?= _('Name') ?></th>
 <td><?= htmlReady($course['name']) ?></td>
 </tr>
-<? if ($course['untertitel']): ?>
+<? if (!empty($course['untertitel'])): ?>
 <tr>
 <th><?= _('Untertitel') ?></th>
 <td><?= htmlReady($course['untertitel']) ?></td>
@@ -77,7 +77,7 @@
 </table>
 <br><br>
 
-<? if ($course['children']) : ?>
+<? if (!empty($course['children'])) : ?>
     <?= $this->render_partial('my_courses/_exportcourse', [
         'course_collection' => $course['children'],
         'children'          => true,