diff --git a/app/javascript/vue/repositories/modals/import/second_step.vue b/app/javascript/vue/repositories/modals/import/second_step.vue
index 556290ff0..75ee0ea8f 100644
--- a/app/javascript/vue/repositories/modals/import/second_step.vue
+++ b/app/javascript/vue/repositories/modals/import/second_step.vue
@@ -86,6 +86,7 @@
                 :stepProps="stepProps"
                 @selection:changed="handleChange"
                 :availableFields="this.availableFields"
+                :autoMapping="this.autoMapping"
               />
             </div>
           </div>
@@ -153,7 +154,7 @@ export default {
   },
   data() {
     return {
-      autoMapping: false,
+      autoMapping: true,
       updateWithEmptyCells: false,
       onlyAddNewItems: false,
       columnLabels: {
diff --git a/app/javascript/vue/repositories/modals/import/second_step_table_row.vue b/app/javascript/vue/repositories/modals/import/second_step_table_row.vue
index c9223862c..0b19f3036 100644
--- a/app/javascript/vue/repositories/modals/import/second_step_table_row.vue
+++ b/app/javascript/vue/repositories/modals/import/second_step_table_row.vue
@@ -23,8 +23,11 @@
         @isOpen="handleIsOpen"
         :clearable="true"
         :size="'sm'"
-        placeholder="Do not import"
+        :placeholder="computeMatchNotFound ?
+        i18n.t('repositories.import_records.steps.step2.table.tableRow.placeholders.matchNotFound') :
+        i18n.t('repositories.import_records.steps.step2.table.tableRow.placeholders.doNotImport')"
         :title="this.selectedColumnType?.value"
+        :value="this.selectedColumnType?.key"
       ></SelectDropdown>
       <template v-if="selectedColumnType?.key == 'new'">
         <SelectDropdown
@@ -60,7 +63,9 @@
       <!-- <i v-else-if=""></i> -->
 
       <!-- match not found -->
-      <!-- <i v-else-if=""></i> -->
+      <i v-else-if="computeMatchNotFound"
+        class="sn-icon sn-icon-close text-sn-alert-brittlebush" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.matchNotFoundColumnTitle')">
+      </i>
 
       <!-- do not import -->
       <i v-else class="sn-icon sn-icon-close text-sn-sleepy-grey" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.doNotImportColumnTitle')"></i>
@@ -95,6 +100,10 @@ export default {
     stepProps: {
       type: Object,
       required: true
+    },
+    autoMapping: {
+      type: Boolean,
+      required: true
     }
   },
   watch: {
@@ -125,7 +134,31 @@ export default {
         this.i18n.t('repositories.import_records.steps.step2.table.tableRow.systemGeneratedData.updatedOn')]
     };
   },
+  watch: {
+    autoMapping(newVal, oldVal) {
+      if (newVal === true) {
+        this.autoMap();
+      } else {
+        this.clearAutoMap();
+      }
+    }
+  },
+  computed: {
+    computeMatchNotFound() {
+      return this.autoMapping && ((this.selectedColumnType && !this.selectedColumnType.key) || !this.selectedColumnType);
+    }
+  },
   methods: {
+    autoMap() {
+      Object.entries(this.stepProps.availableFields).forEach(([key, value]) => {
+        if (this.item === value) {
+          this.changeSelected(key);
+        }
+      });
+    },
+    clearAutoMap() {
+      this.changeSelected(null);
+    },
     changeSelected(e) {
       let value;
       if (e === 'new') {
@@ -143,6 +176,11 @@ export default {
         tableRows.style.overflow = 'hidden';
       } else tableRows.style.overflow = 'auto';
     }
+  },
+  mounted() {
+    if (this.autoMapping) {
+      this.autoMap();
+    }
   }
 };
 </script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b7ede11a8..20543ace7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2240,7 +2240,11 @@ en:
             RepositoryStockValue: 'Stock'
           table:
             tableRow:
+              placeholders:
+                matchNotFound: 'Match not found'
+                doNotImport: 'Do not import'
               defaultColumnTitle: 'Default column. Mapped as identifier.'
+              matchNotFoundColumnTitle: 'Match not found.'
               userDefinedColumnTitle: 'Column name does not match. Column will be imported as '
               importedColumnTitle: 'Column will be imported.'
               doNotImportColumnTitle: 'Column will not import.'