diff --git a/user/edit_form.php b/user/edit_form.php
index 61a98a773ce..a083def970e 100644
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -62,7 +62,7 @@ class user_edit_form extends moodleform {
         }
 
         // remove description
-        if (!get_record('role_assignments', 'userid', $userid) && empty($user->description) && $CFG->profilesforenrolledusersonly) {
+        if (!get_record('role_assignments', 'userid', $userid) && empty($user->description) && !empty($CFG->profilesforenrolledusersonly)) {
             $mform->removeElement('description');
         }
 
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 9e9b9df4208..6615c111c94 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -79,7 +79,7 @@ class user_editadvanced_form extends moodleform {
         $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         $can_edit_user = has_capability('moodle/user:update', $sitecontext);
         // remove description
-        if (!get_record('role_assignments', 'userid', $userid) && empty($user->description) && $CFG->profilesforenrolledusersonly && !$can_edit_user) {
+        if (!get_record('role_assignments', 'userid', $userid) && empty($user->description) && !empty($CFG->profilesforenrolledusersonly) && !$can_edit_user) {
             $mform->removeElement('description');
         }
 
diff --git a/user/view.php b/user/view.php
index 9cf9dfb7dc8..26ee4c33ee9 100644
--- a/user/view.php
+++ b/user/view.php
@@ -222,7 +222,7 @@
     if ($user->description && !isset($hiddenfields['description'])) {
         $has_courseid = ($course->id != SITEID);
         if (!get_record('role_assignments', 'userid', $id)
-            && !$has_courseid && $CFG->profilesforenrolledusersonly) {
+            && !$has_courseid && !empty($CFG->profilesforenrolledusersonly)) {
             echo get_string('profilenotshown', 'moodle').'<hr />';
         } else {
             echo format_text($user->description, FORMAT_MOODLE)."<hr />";
@@ -331,6 +331,7 @@
     /// Print the Custom User Fields
     profile_display_fields($user->id);
 
+    require_once($CFG->dirroot . '/blocks/extrafields/user_view.php');
 
     if ($mycourses = get_my_courses($user->id, null, null, false, 21)) {
         $shown=0;