diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index fd37fb402da..ad6abe38a48 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -400,11 +400,11 @@ function isadmin($userid=0) {
     }
 }
 
-function isteacher($courseid, $userid=0) {
+function isteacher($courseid, $userid=0, $includeadmin=true) {
 /// Is the user a teacher or admin?
     global $USER;
 
-    if (isadmin($userid)) {  // admins can do anything the teacher can
+    if ($includeadmin and isadmin($userid)) {  // admins can do anything the teacher can
         return true;
     }