Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.11
diff -u -p -r1.11 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	5 Sep 2009 12:34:00 -0000	1.11
+++ modules/field_ui/field_ui.admin.inc	5 Sep 2009 14:57:15 -0000
@@ -793,6 +793,7 @@ function field_ui_field_has_data($field)
  * Menu callback; presents the field settings edit page.
  */
 function field_ui_field_settings_form(&$form_state, $obj_type, $bundle, $instance) {
+
   $bundle = field_attach_extract_bundle($obj_type, $bundle);
   $field = field_info_field($instance['field_name']);
 
@@ -802,6 +803,8 @@ function field_ui_field_settings_form(&$
     $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';
@@ -1019,7 +1022,7 @@ 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'];
+  $title = isset($instance['title']) ? $instance['title'] : $instance['label'];
   drupal_set_title(check_plain($title));
 
   // Create a form structure for the instance values.