diff --git a/admin/roles/assign.html b/admin/roles/assign.html
index 620d77bcf71..87e4e03b3ac 100755
--- a/admin/roles/assign.html
+++ b/admin/roles/assign.html
@@ -25,7 +25,12 @@
           <?php
               foreach ($contextusers as $contextuser) {
                   $fullname = fullname($contextuser, true);
-                  echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email."</option>\n";
+                  if ($contextuser->hidden) {
+                      $hidden=' ('.get_string('hidden').') ';  
+                  } else {
+                      $hidden="";  
+                  }
+                  echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
               }
           ?>
 
diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 48ee603c521..48db1878166 100755
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -191,7 +191,7 @@
     /// Get all existing participants in this context.
         // Why is this not done with get_users???
 
-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email')) {
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
             $contextusers = array();
         }