diff --git a/course/modedit.php b/course/modedit.php
index 488a3af..d6338e6 100644
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -398,7 +398,7 @@ if ($mform->is_cancelled()) {
             print_error('cannotaddcoursemodule');
         }
 
-        if (plugin_supports('mod', $fromform->modulename, FEATURE_MOD_INTRO, false)) {
+        if (plugin_supports('mod', $fromform->modulename, FEATURE_MOD_INTRO, true)) {
             $introeditor = $fromform->introeditor;
             unset($fromform->introeditor);
             $fromform->intro       = $introeditor['text'];
@@ -426,7 +426,7 @@ if ($mform->is_cancelled()) {
 
         // update embedded links and save files
         $modcontext = get_context_instance(CONTEXT_MODULE, $fromform->coursemodule);
-        if (plugin_supports('mod', $fromform->modulename, FEATURE_MOD_INTRO, true)) {
+        if (!empty($introeditor)) {
             $fromform->intro = file_save_draft_area_files($introeditor['itemid'], $modcontext->id,
                                                           'mod_'.$fromform->modulename, 'intro', 0,
                                                           array('subdirs'=>true), $introeditor['text']);