--- node_import.admin.inc	2009-02-14 23:23:16.000000000 +1300
+++ node_import.admin.inc_new	2010-02-17 13:19:28.427874346 +1300
@@ -336,13 +336,22 @@ function node_import_add_form(&$form_sta
     foreach ($fields as $fieldname => $fieldinfo) {
       if ($fieldinfo['is_mappable']) {
         if (empty($fieldinfo['columns'])) {
+          $default = '';
+          foreach ($map_optional as $key => $value) {
+            if ($fieldinfo['cck:fieldname'] == $value) {
+              $default = $key;
+            }
+            else if ( ($fieldname == 'title') && ($value == 'title') ) {
+                $default = $key;
+            }
+          }
           $form['map'][$fieldname] = array(
             '#title' => $fieldinfo['title'],
             '#node_import-group' => $fieldinfo['group'],
             '#type' => 'select',
             '#options' => $fieldinfo['map_required'] ? $map_required : $map_optional,
             '#multiple' => $fieldinfo['has_multiple'] || $fieldinfo['has_hierarchy'],
-            '#default_value' => isset($values['map'][$fieldname]) ? $values['map'][$fieldname] : '',
+            '#default_value' => $default,
           );
         }
         else {