diff --git a/admin/settings/users.php b/admin/settings/users.php
index 8d93b5a4440..d4449614e75 100644
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -28,7 +28,7 @@ if ($hassiteconfig
         $choices['1'] = new lang_string('emaildisplayyes');
         $choices['2'] = new lang_string('emaildisplaycourse');
         $temp->add(new admin_setting_configselect('defaultpreference_maildisplay', new lang_string('emaildisplay'),
-            '', 2, $choices));
+            new lang_string('emaildisplay_help'), 2, $choices));
 
         $choices = array();
         $choices['0'] = new lang_string('textformat');
diff --git a/admin/tool/uploaduser/user_form.php b/admin/tool/uploaduser/user_form.php
index c291a735299..c0eb764883a 100644
--- a/admin/tool/uploaduser/user_form.php
+++ b/admin/tool/uploaduser/user_form.php
@@ -229,6 +229,7 @@ class admin_uploaduser_form2 extends moodleform {
         $choices = array(0 => get_string('emaildisplayno'), 1 => get_string('emaildisplayyes'), 2 => get_string('emaildisplaycourse'));
         $mform->addElement('select', 'maildisplay', get_string('emaildisplay'), $choices);
         $mform->setDefault('maildisplay', core_user::get_property_default('maildisplay'));
+        $mform->addHelpButton('maildisplay', 'emaildisplay');
 
         $choices = array(0 => get_string('textformat'), 1 => get_string('htmlformat'));
         $mform->addElement('select', 'mailformat', get_string('emailformat'), $choices);
diff --git a/enrol/lti/lib.php b/enrol/lti/lib.php
index 9442c26e028..df7c08e24a4 100644
--- a/enrol/lti/lib.php
+++ b/enrol/lti/lib.php
@@ -298,6 +298,7 @@ class enrol_lti_plugin extends enrol_plugin {
         );
         $mform->addElement('select', 'maildisplay', get_string('emaildisplay'), $choices);
         $mform->setDefault('maildisplay', $emaildisplay);
+        $mform->addHelpButton('maildisplay', 'emaildisplay');
 
         $city = get_config('enrol_lti', 'city');
         $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
diff --git a/enrol/lti/settings.php b/enrol/lti/settings.php
index b6d31a0dcb4..b839f76942d 100644
--- a/enrol/lti/settings.php
+++ b/enrol/lti/settings.php
@@ -47,8 +47,8 @@ if ($ADMIN->fulltree) {
                      1 => get_string('emaildisplayyes'),
                      2 => get_string('emaildisplaycourse'));
     $maildisplay = isset($CFG->defaultpreference_maildisplay) ? $CFG->defaultpreference_maildisplay : 2;
-    $settings->add(new admin_setting_configselect('enrol_lti/emaildisplay', get_string('emaildisplay'), '',
-        $maildisplay, $choices));
+    $settings->add(new admin_setting_configselect('enrol_lti/emaildisplay', get_string('emaildisplay'),
+        get_string('emaildisplay_help'), $maildisplay, $choices));
 
     $city = '';
     if (!empty($CFG->defaultcity)) {
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 7df89eb5cc3..290be0a3df2 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -615,9 +615,10 @@ $string['emaildigestsubjects'] = 'Subjects (daily email with subjects only)';
 $string['emaildisable'] = 'This email address is disabled';
 $string['emaildisableclick'] = 'Click here to disable all email from being sent to this address';
 $string['emaildisplay'] = 'Email display';
+$string['emaildisplay_help'] = 'Privileged users (such as teachers and managers) will always be able to see your email address.';
 $string['emaildisplaycourse'] = 'Allow only other course members to see my email address';
 $string['emaildisplayhidden'] = 'Email hidden';
-$string['emaildisplayno'] = 'Hide my email address from everyone';
+$string['emaildisplayno'] = 'Hide my email address from non-privileged users';
 $string['emaildisplayyes'] = 'Allow everyone to see my email address';
 $string['emailenable'] = 'This email address is enabled';
 $string['emailenableclick'] = 'Click here to re-enable all email being sent to this address';
diff --git a/user/editlib.php b/user/editlib.php
index 6a42d72fa8d..16fd1684893 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -302,6 +302,7 @@ function useredit_shared_definition(&$mform, $editoroptions, $filemanageroptions
     $choices['2'] = get_string('emaildisplaycourse');
     $mform->addElement('select', 'maildisplay', get_string('emaildisplay'), $choices);
     $mform->setDefault('maildisplay', core_user::get_property_default('maildisplay'));
+    $mform->addHelpButton('maildisplay', 'emaildisplay');
 
     $mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="21"');
     $mform->setType('city', PARAM_TEXT);