Index: addresses.settings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses.settings.inc,v
retrieving revision 1.25
diff -u -p -r1.25 addresses.settings.inc
--- addresses.settings.inc	22 Jan 2009 02:52:52 -0000	1.25
+++ addresses.settings.inc	8 Jun 2009 22:24:29 -0000
@@ -302,7 +302,7 @@ function _addresses_settings_fields($fie
   foreach ($ftypes as $ftype => $field) {
     // List of address fields
     $form['addresses'][$ftype] = array(
-      '#default_value'  => empty($field_values[$ftype]) ? $field['display'] : $field_values[$ftype],
+      '#default_value'  => !isset($field_values[$ftype]) ? $field['display'] : $field_values[$ftype],
       '#options'        => array(
         ADDRESSES_FIELD_NONE      => '',
         ADDRESSES_FIELD_SHOW      => '',