--- address.module.orig	2007-05-01 13:04:18.000000000 -0300
+++ address.module	2007-05-01 13:04:48.000000000 -0300
@@ -390,7 +390,9 @@
     '#attributes' => null,
     '#required' => true,
   );
-  $states = store_build_states($country);
+  $states = store_build_states();
+  drupal_add_js(array("states" => store_build_states()), "setting");
+  drupal_add_js(array("current_state" => array($country, $edit['state'])), "setting");
   array_unshift($states, t('Please choose...'));
   $form['state'] = array(
     '#type' => 'select',