diff --git a/course/info.php b/course/info.php
index 4da6eb3..fbe02d9 100644
--- a/course/info.php
+++ b/course/info.php
@@ -57,12 +57,22 @@
     echo format_text($course->summary, $course->summaryformat, array('overflowdiv'=>true), $course->id);
 
     if (!empty($CFG->coursecontact)) {
+        $enrolledusers = array();
+        foreach (get_enrolled_users($context) as $enrolleduser) {
+            $enrolledusers[$enrolleduser->id] = TRUE;
+        }
+
         $coursecontactroles = explode(',', $CFG->coursecontact);
         foreach ($coursecontactroles as $roleid) {
             $role = $DB->get_record('role', array('id'=>$roleid));
             $roleid = (int) $roleid;
             if ($users = get_role_users($roleid, $context, true)) {
                 foreach ($users as $teacher) {
+                    if (empty($enrolledusers[$teacher->id])) {
+                        // only display users who are enrolled in the course
+                        continue;
+                    }
+
                     $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context));
                     $namesarray[] = format_string(role_get_name($role, $context)).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
                                     $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';
diff --git a/course/lib.php b/course/lib.php
index 6b4874e..c02b40f 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -2548,9 +2548,18 @@ function print_course($course, $highlightterms = '') {
             $aliasnames = $DB->get_records('role_names', array('contextid'=>$context->id), '', 'roleid,contextid,name');
         }
 
-        $namesarray = array();
+        $enrolledusers = array();
+        foreach (get_enrolled_users($context) as $enrolleduser) {
+            $enrolledusers[$enrolleduser->id] = TRUE;
+        }
+
         $canviewfullnames = has_capability('moodle/site:viewfullnames', $context);
         foreach ($rusers as $ra) {
+            if (empty($enrolledusers[$ra->id])) {
+                //  only display users who are enrolled in the course
+                continue;
+            }
+
             if (isset($namesarray[$ra->id])) {
                 //  only display a user once with the higest sortorder role
                 continue;
diff --git a/enrol/index.php b/enrol/index.php
index 14e7da2..e0915a5 100644
--- a/enrol/index.php
+++ b/enrol/index.php
@@ -89,12 +89,22 @@ echo $OUTPUT->box_start('generalbox info');
 $summary = file_rewrite_pluginfile_urls($course->summary, 'pluginfile.php', $context->id, 'course', 'summary', null);
 echo format_text($summary, $course->summaryformat, array('overflowdiv'=>true), $course->id);
 if (!empty($CFG->coursecontact)) {
+    $enrolledusers = array();
+    foreach (get_enrolled_users($context) as $enrolleduser) {
+        $enrolledusers[$enrolleduser->id] = TRUE;
+    }
+
     $coursecontactroles = explode(',', $CFG->coursecontact);
     foreach ($coursecontactroles as $roleid) {
         $role = $DB->get_record('role', array('id'=>$roleid));
         $roleid = (int) $roleid;
         if ($users = get_role_users($roleid, $context, true)) {
             foreach ($users as $teacher) {
+                if (empty($enrolledusers[$teacher->id])) {
+                    // only display users who are enrolled in the course
+                    continue;
+                }
+
                 $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context));
                 $namesarray[] = format_string(role_get_name($role, $context)).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
                     $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';