Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.17
diff -u -p -r1.17 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	26 Sep 2009 15:57:38 -0000	1.17
+++ modules/field_ui/field_ui.admin.inc	28 Sep 2009 16:21:46 -0000
@@ -793,6 +793,8 @@ function field_ui_field_settings_form($f
     $field = field_read_field($field['field_name']);
   }
 
+  drupal_set_title('Settings for '. $instance['label']);
+
   $field_type = field_info_field_types($field['type']);
 
   $info_function = $field['module'] . '_field_info';
@@ -1013,8 +1015,8 @@ function field_ui_field_edit_form($form,
   $widget_type = field_info_widget_types($instance['widget']['type']);
   $bundles = field_info_bundles();
 
-  $title = isset($instance['label']) ? $instance['label'] : $instance['field_name'];
-  drupal_set_title(check_plain($title));
+  $title = isset($instance['title']) ? $instance['title'] : $instance['label'];
+  drupal_set_title($title);
 
   // Create a form structure for the instance values.
   $form['instance'] = array(