Index: admin/settings/courses.php
===================================================================
--- admin/settings/courses.php	(revision 13948)
+++ admin/settings/courses.php	(working copy)
@@ -47,6 +47,8 @@
     $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));
     $temp->add(new admin_setting_configselect('moodlecourse/metacourse', get_string('metacourse'), get_string('coursehelpmetacourse'), 0,array(0 => get_string('no'), 1 => get_string('yes'))));
 
+    $temp->add(new admin_setting_configselect('moodlecourse/enrollable', get_string('enrollable'), get_string('coursehelpenrollable'), 1,array(0 => get_string('no'), 1 => get_string('yes'))));
+
     $ADMIN->add('courses', $temp);
 
     // "courserequests" settingpage
Index: lang/en_utf8/moodle.php
===================================================================
--- lang/en_utf8/moodle.php	(revision 13948)
+++ lang/en_utf8/moodle.php	(working copy)
@@ -289,6 +289,7 @@
 $string['coursehelpshowgrades'] = 'Enable the display of the gradebook. It does not prevent grades from being displayed within the individual activities.';
 $string['coursehelpmaximumupload'] = 'Define the largest size of file that can be uploaded in this course, limited by the site-wide setting.';
 $string['coursehelpmetacourse'] = 'Set the course a metacourse. A meta course takes enrolments (and other role assignments) from a \"child\" course or courses.';
+$string['coursehelpenrollable'] = 'Set the course as enrollable.  If set to Yes, a course is enrollable by default.';
 $string['coursehidden'] = 'This course is currently unavailable to students';
 $string['courseimportnotaught'] = 'You don\'t seem to be an editing teacher in any other courses, there are no courses for you to import from.';
 $string['courseinfo'] = 'Course info';
Index: course/edit_form.php
===================================================================
--- course/edit_form.php	(revision 13948)
+++ course/edit_form.php	(working copy)
@@ -233,7 +233,8 @@
         $radio[] = &MoodleQuickForm::createElement('radio', 'enrollable', null, get_string('enroldate'), 2);
         $mform->addGroup($radio, 'enrollable', get_string('enrollable'), ' ', false);
         $mform->setHelpButton('enrollable', array('courseenrollable2', get_string('enrollable')), true);
-        $mform->setDefault('enrollable', 1);
+        $enrolldefault = isset($courseconfig->enrollable) ? $courseconfig->enrollable : 1;
+        $mform->setDefault('enrollable', $enrolldefault);
 
         $enroldatestartgrp = array();
         $enroldatestartgrp[] = &MoodleQuickForm::createElement('date_selector', 'enrolstartdate');