diff --git a/course/edit.php b/course/edit.php
index 053d8bb8f0314..e3688a18a5441 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -85,6 +85,13 @@
     //editor should respect category context if course context is not set.
     $editoroptions['context'] = $catcontext;
     $course = file_prepare_standard_editor($course, 'summary', $editoroptions, null, 'course', 'summary', null);
+
+    // Set up the default restricted module list
+    if (!empty($CFG->restrictbydefault)) {
+        if (!empty($CFG->defaultallowedmodules)) {
+            $course->allowedmods = explode(',', $CFG->defaultallowedmodules);
+        }
+    }
 }
 
 // first create the form
diff --git a/course/lib.php b/course/lib.php
index 3b79d66902d76..a0e4c15c24084 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -3778,7 +3778,7 @@ function create_course($data, $editoroptions = NULL) {
     fix_course_sortorder();
 
     // update module restrictions
-    if ($course->restrictmodules) {
+    if ($course->restrictmodules || $CFG->restrictbydefault ) {
         if (isset($data->allowedmods)) {
             update_restricted_mods($course, $data->allowedmods);
         } else {