diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 22b80ed65fc003ba8fe943568c945e4859c60bdd..18ae67191f5196488dc56f0777fb76b01bcce742 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -129,7 +129,7 @@ class BasicDataWizardStep implements CourseWizardStep
         if (!empty($values['studygroup']) || count($institutes) > 0) {
             $tpl->set_attribute('institutes', $institutes);
             if (empty($values['institute'])) {
-                if ($GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT && Request::isXhr()) {
+                if ($GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT !== 'all' && Request::isXhr()) {
                     $values['institute'] = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
                 } else {
                     $values['institute'] = InstituteMember::getDefaultInstituteIdForUser($GLOBALS['user']->id);