--- location.module	Wed Nov  7 15:34:06 2007
+++ location.module.old	Wed Nov  7 15:36:19 2007
@@ -1416,9 +1416,9 @@ function location_user($op, &$edit, &$us
     return;
   }
   
-  if (($op == 'form' && $category == 'account' && $user_setting == LOCATION_USER_COLLECT) || ($op == 'register' && $user_setting == LOCATION_USER_COLLECT)) {
+  if ($op == 'form' && $category == 'account' && $user_setting == LOCATION_USER_COLLECT) {
     $form = array(1 => array());
-    $form[0]['location'] = location_form(array('street', 'city', 'province', 'postal_code', 'country'), (isset($user->location) && !_location_is_empty($user->location)) ? location_api2form($user->location) : array('country' => variable_get('location_default_country', 'us')), array('postal_code'), variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array());
+    $form[0]['location'] = location_form(array('street', 'city', 'province', 'postal_code', 'country'), (isset($user->location) && !_location_is_empty($user->location)) ? location_api2form($user->location) : array('country' => variable_get('location_default_country', 'us')), array(), variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array());
     $form[0]['location']['#type'] = 'fieldset';
     $form[0]['location']['#title'] = t('Location');
     $form[0]['location']['#tree'] = TRUE;