--- location.module.orig	2011-02-05 03:58:59.000000000 +0100
+++ location.module	2011-02-07 16:45:21.000000000 +0100
@@ -655,11 +655,17 @@ function location_locationapi(&$obj, $op
           else {
             $country = variable_get('site_default_country', 'us');
           }
+          if (empty($a5['cck_preview_in_progress'])) {
+            $province = variable_get('location_use_province_abbreviation', 1) ? $obj : location_province_name($country, $obj);
+          }
+          else {
+            $province = $obj;
+          }
           return array(
             '#type' => 'textfield',
             '#title' => t('State/Province'),
             '#autocomplete_path' => 'location/autocomplete/'. $country,
-            '#default_value' => variable_get('location_use_province_abbreviation', 1) ? $obj : location_province_name($country, $obj),
+            '#default_value' => $province,
             '#size' => 64,
             '#maxlength' => 64,
             '#description' => NULL,