diff --git a/lib/adminlib.php b/lib/adminlib.php
index 6d5f37d0be7..ca90fd2bc0c 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4034,7 +4034,7 @@ class admin_setting_question_behaviour extends admin_setting_configselect {
     public function load_choices() {
         global $CFG;
         require_once($CFG->dirroot . '/question/engine/lib.php');
-        $this->choices = question_engine::get_behaviour_options();
+        $this->choices = question_engine::get_behaviour_options('');
         return true;
     }
 }
diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index 176a8993fbc..c8f1ea83bcc 100644
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -64,7 +64,7 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
 
         // Work out a sensible default alternative to manualgraded.
         require_once($CFG->libdir . '/questionlib.php');
-        $behaviours = question_engine::get_behaviour_options();
+        $behaviours = question_engine::get_behaviour_options('');
         if (array_key_exists('deferredfeedback', $behaviours)) {
              $defaultbehaviour = 'deferredfeedback';
         } else {