diff --git a/lib/conditionlib.php b/lib/conditionlib.php
index 57f9e359d3e..6e9dc833a4e 100644
--- a/lib/conditionlib.php
+++ b/lib/conditionlib.php
@@ -547,7 +547,7 @@ abstract class condition_info_base {
                     }
                 } else {
                     $field = $condition->userfield;
-                    $fieldname = $condition->userfield;
+                    $fieldname = get_user_field_name($condition->userfield);
                 }
                 $details = new stdClass;
                 $details->fieldname = $fieldname;
@@ -829,7 +829,7 @@ abstract class condition_info_base {
             foreach ($this->item->conditionsfield as $field => $details) {
                 $a = new stdclass;
                 $a->field = format_string($details->fieldname, true, array('context' => $context));
-                $a->value = $details->value;
+                $a->value = s($details->value);
                 $information .= html_writer::start_tag('li');
                 $information .= get_string('requires_user_field_'.$details->operator, 'condition', $a) . ' ';
                 $information .= html_writer::end_tag('li');
@@ -1061,7 +1061,7 @@ abstract class condition_info_base {
                     $available = false;
                     $a = new stdClass();
                     $a->field = format_string($details->fieldname, true, array('context' => $context));
-                    $a->value = $details->value;
+                    $a->value = s($details->value);
                     $information .= html_writer::start_tag('li');
                     $information .= get_string('requires_user_field_'.$details->operator, 'condition', $a) . ' ';
                     $information .= html_writer::end_tag('li');