diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php
index d430a48a57..4124faeb02 100644
--- a/importexport/inc/class.importexport_definitions_ui.inc.php
+++ b/importexport/inc/class.importexport_definitions_ui.inc.php
@@ -529,10 +529,6 @@ class importexport_definitions_ui
 				$button = array_keys($content['button']);
 				$content['button'] = array($button[0] => 'pressed');
 			}
-			// Override next button on step 21, to do a regular submit for the file upload
-			if($content['step'] == 'wizard_step21') {
-				$this->etpl->set_cell_attribute('button[next]', 'onclick', '');
-			}
 
 			// post process submitted step
 			if($content['step']) {
@@ -556,6 +552,12 @@ class importexport_definitions_ui
 			// pre precess next step
 			$sel_options = $readonlys = $preserv = array();
 
+			// Override next button on step 30, to do a regular submit for the file upload
+			if($next_step == 'wizard_step30')
+			{
+				$this->etpl->set_cell_attribute('button[next]', 'onclick', '');
+			}
+
 			// Disable finish button if required fields are missing
 			if(!$content['name'] || !$content['type'] || !$content['plugin']) {
 				$GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');");
diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index c42725f84e..58b0c4173b 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -347,7 +347,7 @@ class importexport_wizard_basic_import_csv
 				$j++;
 			}
 			$sel_options['field_mapping'] = array('--NONE--' => lang('none')) + $this->mapping_fields;
-			$GLOBALS['egw']->js->set_onload('$j("option[value=\'--NONE--\']:selected").closest("tr").effect("highlight",{},10000);');
+			$GLOBALS['egw']->js->set_onload('$j("option[value=\'--NONE--\']:selected").closest("tr").animate({backgroundColor: "#ffff99"}, 1000);');
 			unset ($preserv['button']);
 			return $this->step_templates[$content['step']];
 		}