diff --git a/user/edit.php b/user/edit.php
index c70147ca683..53abc59c429 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -216,7 +216,7 @@
             }
 
             /// Update the custom user fields
-            if ($categories = get_records_select('user_info_category', '1', 'sortorder ASC')) {
+            if ($categories = get_records_select('user_info_category', '', 'sortorder ASC')) {
                 foreach ($categories as $category) {
 
                     if ($fields = get_records_select('user_info_field', "categoryid=$category->id", 'sortorder ASC')) {
diff --git a/user/edit_form.php b/user/edit_form.php
index b91dc68d9a2..4c4591ab488 100644
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -319,7 +319,7 @@ class user_edit_form extends moodleform {
         $mform->hardFreeze($freezefields);
 
         /// Next the customisable categories
-        if ($categories = get_records_select('user_info_category', '1', 'sortorder ASC')) {
+        if ($categories = get_records_select('user_info_category', '', 'sortorder ASC')) {
             foreach ($categories as $category) {
                 if ($fields = get_records_select('user_info_field', "categoryid=$category->id", 'sortorder ASC')) {
 
@@ -395,7 +395,7 @@ class user_edit_form extends moodleform {
 
         /// And now we validate the custom data fields
 
-        if ($categories = get_records_select('user_info_category', '1', 'sortorder ASC')) {
+        if ($categories = get_records_select('user_info_category', '', 'sortorder ASC')) {
             foreach ($categories as $category) {
 
                 if ($fields = get_records_select('user_info_field', "categoryid=$category->id", 'sortorder ASC')) {