diff --git a/modules/profile.module b/modules/profile.module
index fe631a568a5ef34c28ce5dac2c5f1e8d72b685cc..280c5c0cc693f80bde3d1e0a5d43731d1ffeeda6 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -207,7 +207,7 @@ function profile_browse() {
   else {
     // Compile a list of fields to show
     $fields = array();
-    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY weight', PROFILE_PUBLIC_LISTINGS);
+    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY category, weight', PROFILE_PUBLIC_LISTINGS);
     while ($record = db_fetch_object($result)) {
       $fields[] = $record;
     }
@@ -261,10 +261,6 @@ function profile_view_field($user, $field) {
   // Only allow browsing of private fields for admins
   $browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE;
 
-  if ($field->fid == 18 || $field->fid == 19 || $field->fid == 20) {
-    return;
-  }
-
   if ($value = $user->{$field->name}) {
     switch ($field->type) {
       case 'textfield':
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index fe631a568a5ef34c28ce5dac2c5f1e8d72b685cc..280c5c0cc693f80bde3d1e0a5d43731d1ffeeda6 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -207,7 +207,7 @@ function profile_browse() {
   else {
     // Compile a list of fields to show
     $fields = array();
-    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY weight', PROFILE_PUBLIC_LISTINGS);
+    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY category, weight', PROFILE_PUBLIC_LISTINGS);
     while ($record = db_fetch_object($result)) {
       $fields[] = $record;
     }
@@ -261,10 +261,6 @@ function profile_view_field($user, $field) {
   // Only allow browsing of private fields for admins
   $browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE;
 
-  if ($field->fid == 18 || $field->fid == 19 || $field->fid == 20) {
-    return;
-  }
-
   if ($value = $user->{$field->name}) {
     switch ($field->type) {
       case 'textfield':