diff --git a/cck_phone.module b/cck_phone.module
index 76a8bc6..fc4edb6 100644
--- a/cck_phone.module
+++ b/cck_phone.module
@@ -442,8 +442,8 @@ function _cck_phone_process(&$item, $delta = 0, $field, $instance, $langcode) {
   // Don't save an invalid default value.
   if ((isset($instance['default_value']) && $item['number'] == $instance['default_value']) && (isset($settings['default_country']) && $item['country_codes'] == $settings['default_country'])) {
     if (!cck_phone_validate_number($item['country_codes'], $item['number'], $item['extension'])) {
-      unset($item['number']);
       unset($item['country_codes']);
+      unset($item['number']);
       unset($item['extension']);
     }
   }
@@ -704,6 +704,20 @@ function cck_phone_phone_number_process($element, &$form_state, $form) {
   $instance = field_widget_instance($element, $form_state);
   $settings = $instance['settings'];
 
+  $element['country_codes'] = array(
+    '#type' => 'select',
+//    '#title' => 'Country code',
+    '#default_value' => isset($settings['default_country']) ? $settings['default_country'] : NULL,
+    '#options' => _cck_phone_cc_options(),
+  );
+/*  if ($field['all_country_codes']) {
+    $element['country_codes']['#options'] = _cck_phone_cc_options();
+  }
+  else {
+    $element['country_codes']['#options'] = _cck_phone_cc_options(FALSE, $field['country_selection']);
+  }
+*/
+
   $element['number'] = array(
     '#type' => 'textfield',
     '#maxlength' => $field['settings']['size'],
@@ -726,19 +740,6 @@ function cck_phone_phone_number_process($element, &$form_state, $form) {
     );
   }
 */
-  $element['country_codes'] = array(
-    '#type' => 'select',
-//    '#title' => 'Country code',
-    '#default_value' => isset($settings['default_country']) ? $settings['default_country'] : NULL,
-    '#options' => _cck_phone_cc_options(),
-  );
-/*  if ($field['all_country_codes']) {
-    $element['country_codes']['#options'] = _cck_phone_cc_options();
-  }
-  else {
-    $element['country_codes']['#options'] = _cck_phone_cc_options(FALSE, $field['country_selection']);
-  }
-*/
   return $element;
 }