--- profile.module.orig	2005-10-02 13:22:35.000000000 +1000
+++ profile.module	2005-10-02 17:45:50.000000000 +1000
@@ -580,15 +580,17 @@ function profile_admin_delete($fid) {
   $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
   if ($_POST['edit']['confirm']) {
     db_query('DELETE FROM {profile_fields} WHERE fid = %d', $fid);
+    db_query('DELETE FROM {profile_values} WHERE fid = %d', $fid);
     cache_clear_all();
     drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $field->title))));
     drupal_goto('admin/settings/profile');
   }
   else {
     $output = theme('confirm',
-                    t('Do you want to remove the field %field?',
-                    array('%field' => $field->title)),
-                    'admin/settings/profile');
+                    t('Are you sure you want to delete the field %field?', array('%field' => $field->title)),
+                    'admin/settings/profile',
+                    t('If users have entered values into this field in their profile, these entries will also be deleted.  If you want to keep the user-entered data you may wish to <a href="%editfield">edit this field</a> and change it to a hidden field rather than deleting it. This action cannot be undone.', array('%editfield' => url('admin/settings/profile/edit/' . $fid))),
+                  t('Delete'));
     return $output;
   }
 }