diff --git a/admin/user.php b/admin/user.php
index a52db6c780c..0f6660345ee 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -279,10 +279,6 @@
 
         $table->id = "users";
         foreach ($users as $user) {
-            if (isguestuser($user)) {
-                continue; // do not display guest here
-            }
-
             $buttons = array();
             $lastcolumn = '';
 
diff --git a/lib/datalib.php b/lib/datalib.php
index f54eae6f898..97c51325e90 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -375,12 +375,12 @@ function get_users($get=true, $search='', $confirmed=false, array $exceptions=nu
 function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperpage=0,
                            $search='', $firstinitial='', $lastinitial='', $extraselect='',
                            array $extraparams=null, $extracontext = null) {
-    global $DB;
+    global $DB, $CFG;
 
     $fullname  = $DB->sql_fullname();
 
-    $select = "deleted <> 1";
-    $params = array();
+    $select = "deleted <> 1 AND id <> :guestid";
+    $params = array('guestid' => $CFG->siteguest);
 
     if (!empty($search)) {
         $search = trim($search);