diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index dc2ba27ca43..58c65c520c9 100644
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -56,8 +56,16 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             6 => get_string('saturday', 'calendar')
         )));
     $temp->add(new admin_setting_special_calendar_weekend());
-    $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
-    $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+    $options = array();
+    for ($i=1; $i<=99; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,$options));
+    $options = array();
+    for ($i=1; $i<=20; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,$options));
     $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
     $temp->add(new admin_setting_configtext('calendar_exportsalt', get_string('calendarexportsalt','admin'), get_string('configcalendarexportsalt', 'admin'), random_string(60)));
     $ADMIN->add('appearance', $temp);
diff --git a/calendar/preferences_form.php b/calendar/preferences_form.php
index 828055da60e..0ad0fb268ff 100644
--- a/calendar/preferences_form.php
+++ b/calendar/preferences_form.php
@@ -71,7 +71,7 @@ class calendar_preferences_form extends moodleform {
         $mform->addHelpButton('maxevents', 'pref_maxevents', 'calendar');
 
         $options = array();
-        for ($i=1; $i<=20; $i++) {
+        for ($i=1; $i<=99; $i++) {
             $options[$i] = $i;
         }
         $mform->addElement('select', 'lookahead', get_string('pref_lookahead', 'calendar'), $options);