diff --git a/admin/index.php b/admin/index.php
index 338a2758374..e7298cdfffa 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -339,8 +339,10 @@
                          "<P><A HREF=\"../course/teacher.php\">".get_string("assignteachers")."</A></P>".
                          "<P><A HREF=\"../course/delete.php\">".get_string("deletecourse")."</A></P>".
                          "<P><A HREF=\"../course/categories.php\">".get_string("categories")."</A></P>";
-		$table->data[0][2] = "<P><A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A></P>".
-                         "<P><A HREF=\"user.php\">".get_string("edituser")."</A></P>".
+        if($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+		    $table->data[0][2] = "<P><A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A></P>";
+        }    
+        $table->data[0][2] .=  "<P><A HREF=\"user.php\">".get_string("edituser")."</A></P>".
                          "<P><A HREF=\"admin.php\">".get_string("assignadmins")."</A></P>".
                          "<P><A HREF=\"creators.php\">".get_string("assigncreators")."</A></P>".
                          "<P><A HREF=\"auth.php\">".get_string("authentication")."</A></P>";
diff --git a/course/lib.php b/course/lib.php
index 2fd0b6f1218..357e896af0a 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -669,8 +669,10 @@ function print_admin_links ($siteid, $width=180) {
 		$modicon[]=$icon;
 		$moddata[]="<HR>";
 		$modicon[]="";
-		$moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</A>";
-		$modicon[]=$icon;
+        if($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+		    $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</A>";
+		    $modicon[]=$icon;
+        }
 		$moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/user.php\">".get_string("edituser")."</A>";
 		$modicon[]=$icon;
 		$moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/admin.php\">".get_string("assignadmins")."</A>";