diff -drup addresses/addresses.module addresses_customize/addresses.module
--- addresses/addresses.module	2010-07-09 04:06:50.000000000 -0400
+++ addresses_customize/addresses.module	2010-07-12 13:10:32.424125000 -0400
@@ -193,7 +193,7 @@ function addresses_elements_process($ele
     ? variable_get('addresses_user_settings', array())
     : $form['#field_info'][$element['#field_name']];
   $fields = $element['#fields'];
-  $values = $element['#default_value'];
+  $values = $element['#default_value'];       
 
   // Reset the required fields based on the general required value
   if (empty($element['#required'])) {
@@ -224,16 +224,16 @@ function addresses_elements_process($ele
   // Update the $fields array to reflect element visibility settings per the
   // new global settings options.  It would be cleaner to simply update the
   // form generation function, but this method will be compatible with extra
-  // contrib fields.
+  // contrib fields. 
   foreach (array_keys($fields) as $ftype) {
-    if (isset($fields[$ftype]) && !empty($settings[$ftype . '_select'])) {
+    if (!empty($settings[$ftype . '_select'])) {
       $fields[$ftype] = $settings[$ftype . '_select'];
     }
   }
-
+  
   // Invoke addressfieldapi to allow modules to add their own addresses fields.
   // Then update these fields with the global settings for each field instance.
-  $extra = module_invoke_all('addressesfieldapi', 'form', $fields, $values);
+  $extra = module_invoke_all('addressesfieldapi', 'form', $fields, $values);  
   foreach (element_children($extra) as $ename) {
     if (isset($settings[$ename . '_label'])) {
       $extra[$ename]['#title'] = t($settings[$ename . '_label']);
diff -drup addresses/addresses.settings.inc addresses_customize/addresses.settings.inc
--- addresses/addresses.settings.inc	2010-07-09 04:06:50.000000000 -0400
+++ addresses_customize/addresses.settings.inc	2010-07-12 12:06:37.783500000 -0400
@@ -141,7 +141,7 @@ function _addresses_addressesfieldapi_fo
         '#value' => isset($values[$ftype]) ? $values[$ftype] : '',
       );
     }
-  }
+  } 
 
   return $form;
 }
@@ -560,7 +560,6 @@ function _addresses_settings_fields($fie
     $form['addresses'][$ftype][$ftype . '_desc'] = array(
       '#type' => 'textfield',
       '#size' => 60,
-      '#maxlength' => 255,
       '#default_value' => !isset($field_values[$ftype . '_desc']) ? $field['description'] : $field_values[$ftype . '_desc'],
     );
     $form['addresses'][$ftype]['#title'] = $field['title'];