diff --git a/calendar/event_form.php b/calendar/event_form.php
index 1dd18d1759d4a..9bbae6c259e8d 100644
--- a/calendar/event_form.php
+++ b/calendar/event_form.php
@@ -133,14 +133,16 @@ function definition () {
             $mform->setDefault('repeats', 1);
             $mform->disabledIf('repeats','repeat','notchecked');
 
-        } else if ($repeatedevents > 0) {
+        } else if ($repeatedevents) {
 
             $mform->addElement('hidden', 'repeatid');
             $mform->setType('repeatid', PARAM_INT);
 
             $mform->addElement('header', 'repeatedevents', get_string('repeatedevents', 'calendar'));
-            $mform->addElement('checkbox', 'repeateditall', null, get_string('repeateditall', 'calendar', $repeatedevents), 'repeat');
-            $mform->setDefault('repeateditall', 'checked');
+            $mform->addElement('radio', 'repeateditall', null, get_string('repeateditall', 'calendar', $this->_customdata->event->eventrepeats), 1);
+            $mform->addElement('radio', 'repeateditall', null, get_string('repeateditthis', 'calendar'), 0);
+
+            $mform->setDefault('repeateditall', 1);
 
         }
 
diff --git a/lang/en/calendar.php b/lang/en/calendar.php
index 5157014e63e75..dd0b7b46985e1 100644
--- a/lang/en/calendar.php
+++ b/lang/en/calendar.php
@@ -114,7 +114,7 @@
 $string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
 $string['recentupcoming'] = 'Recent and next 60 days';
 $string['repeatedevents'] = 'Repeated events';
-$string['repeateditall'] = 'Apply changes to all {$a} events in this repeat series';
+$string['repeateditall'] = 'Also apply changes to the other {$a} events in this repeat series';
 $string['repeateditthis'] = 'Apply changes to this event only';
 $string['repeatevent'] = 'Repeat this event';
 $string['repeatnone'] = 'No repeats';