diff --git a/admin/settings/courses.php b/admin/settings/courses.php
index 6a6c8a5..c2b0d6a 100644
--- a/admin/settings/courses.php
+++ b/admin/settings/courses.php
@@ -47,6 +47,22 @@ if ($hassiteconfig
     $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'))));
 
+    $choices = array();
+    $choices[NOGROUPS] = get_string('groupsnone', 'group');
+    $choices[SEPARATEGROUPS] = get_string('groupsseparate', 'group');
+    $choices[VISIBLEGROUPS] = get_string('groupsvisible', 'group');
+    $temp->add(new admin_setting_configselect('moodlecourse/groupmode', get_string('groupmode'), get_string('coursehelpgroupmode'), 0,$choices));
+
+    $choices = array();
+    $choices['0'] = get_string('courseavailablenot');
+    $choices['1'] = get_string('courseavailable');
+    $temp->add(new admin_setting_configselect('moodlecourse/visible', get_string('availability'), get_string('coursehelpavailability'), 0,$choices));
+
+    $choices=array();
+    $choices[''] = get_string('forceno');
+    $choices += get_list_of_languages();
+    $temp->add(new admin_setting_configselect('moodlecourse/forcelanguage', get_string('forcelanguage'), get_string('coursehelpforcelanguage'), '',$choices));
+
     $ADMIN->add('courses', $temp);
 
     // "courserequests" settingpage
diff --git a/course/edit_form.php b/course/edit_form.php
index 2738e51..b247d75 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -289,7 +289,7 @@ class course_edit_form extends moodleform {
         $choices[VISIBLEGROUPS] = get_string('groupsvisible', 'group');
         $mform->addElement('select', 'groupmode', get_string('groupmode'), $choices);
         $mform->setHelpButton('groupmode', array('groupmode', get_string('groupmode')), true);
-        $mform->setDefault('groupmode', 0);
+        $mform->setDefault('groupmode', $courseconfig->groupmode);
 
         $choices = array();
         $choices['0'] = get_string('no');
@@ -313,7 +313,7 @@ class course_edit_form extends moodleform {
         $choices['1'] = get_string('courseavailable');
         $mform->addElement('select', 'visible', get_string('availability'), $choices);
         $mform->setHelpButton('visible', array('courseavailability', get_string('availability')), true);
-        $mform->setDefault('visible', 1);
+        $mform->setDefault('visible', $courseconfig->visible);
         if ($course and !has_capability('moodle/course:visibility', $coursecontext)) {
             $mform->hardFreeze('visible');
             $mform->setConstant('visible', $course->visible);
@@ -370,6 +370,7 @@ class course_edit_form extends moodleform {
         $languages[''] = get_string('forceno');
         $languages += get_list_of_languages();
         $mform->addElement('select', 'lang', get_string('forcelanguage'), $languages);
+        $mform->setDefault('lang', $courseconfig->forcelanguage);
 
 //--------------------------------------------------------------------------------
         if (has_capability('moodle/site:config', $systemcontext) && ((!empty($course->requested) && $CFG->restrictmodulesfor == 'requested') || $CFG->restrictmodulesfor == 'all')) {