Index: addresses.settings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses.settings.inc,v
retrieving revision 1.37
diff -u -r1.37 addresses.settings.inc
--- addresses.settings.inc	9 Feb 2010 23:18:40 -0000	1.37
+++ addresses.settings.inc	27 Feb 2010 15:24:34 -0000
@@ -360,8 +360,15 @@
 
 /**
  * Validate the province field
+ *
+ * @return void
  */
 function _addresses_province_field_validate($form, &$form_state) {
+  // If province is not required and empty then prevent validation
+  if (!$form['province']['#required'] && $form['province']['#value'] == '') {
+    return;
+  }
+
   $province = _addresses_province_valid(
     $form['country']['#value'],
     $form['province']['#value']
@@ -378,7 +385,8 @@
     // Set province to ISO-3166-2 code (properly uppercased)
     $form_state_province = $province;
   }
-  else {
+  // Prevent inability to alter CCK fields in some instances
+  else if ($form_state['values']['form_id'] != 'content_field_edit_form') {
     // Get the province fieldname
     $field_name = $form['province']['#name'];
     $field_name = drupal_substr($field_name, 0, -1);