diff --git a/classes/admin/admin_setting_userselection.php b/classes/admin/admin_setting_userselection.php
index b0c40a3cc..ff9e92a43 100644
--- a/classes/admin/admin_setting_userselection.php
+++ b/classes/admin/admin_setting_userselection.php
@@ -54,12 +54,13 @@ public function get_setting() {
     public function output_html($data, $query='') {
         global $CFG, $OUTPUT, $USER;
         $context = \context_user::instance($USER->id);
+        $fields = \core_user\fields::for_identity($context, false)->get_required_fields();
         $selected = $this->get_setting();
         $options = array(
             'ajax' => 'logstore_xapi/userselection',
             'multiple' => true,
             'perpage' => $CFG->maxusersperpage,
-            'userfields' => implode(',', get_extra_user_fields($context)),
+            'userfields' => implode(',', $fields),
             'valuehtmlcallback' => function($value) {
                 global $DB, $OUTPUT;
                     $user = $DB->get_record('user', ['id' => (int)$value], '*', IGNORE_MISSING);
diff --git a/classes/webservice/logstore_xapi_external.php b/classes/webservice/logstore_xapi_external.php
index 7b8397fbc..392ea335b 100644
--- a/classes/webservice/logstore_xapi_external.php
+++ b/classes/webservice/logstore_xapi_external.php
@@ -63,9 +63,10 @@ public static function get_users($search, $page, $perpage) {
 
         $results = array();
         // Add also extra user fields.
+        $userfields = \core_user\fields::for_identity($usercontext, false)->get_required_fields();
         $requiredfields = array_merge(
             ['id', 'fullname'],
-            get_extra_user_fields($usercontext)
+            $userfields
         );
 
         foreach ($users['users'] as $id => $user) {
@@ -114,8 +115,8 @@ public static function xapi_get_basic_search_conditions($search, $searchanywhere
         $params = array('guestid' => $CFG->siteguest);
         $usercontext = context_user::instance($USER->id);
         if (!empty($search)) {
-            $conditions = get_extra_user_fields($usercontext);
-            foreach (get_all_user_name_fields() as $field) {
+            $conditions = \core_user\fields::for_identity($usercontext, false)->get_required_fields();
+            foreach (\core_user\fields::get_name_fields() as $field) {
                 $conditions[] = 'u.'.$field;
             }
             $conditions[] = $DB->sql_fullname('u.firstname', 'u.lastname');