diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php
index 1cb5a51e1..3e296cb18 100644
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -32,7 +32,8 @@
  * 'file': string Name of the file to load
  * 'session_status': string 'start', 'continue' or 'end'
  * 'percent': integer 0..100 the percentage of completion once the file has been loaded 
- */ 
+ */
+$bBypassMaintenance = true; // Reset maintenance mode in case of problem
 define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index e9b40cbef..aa399b19a 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -2665,6 +2665,9 @@ class WizStepDone extends WizardStep
 		$oPage->add('<img style="border:0" src="'.$sImgUrl.'"/>');
 		$sForm = addslashes($sForm);
 		$oPage->add_ready_script("$('#wiz_form').after('$sForm');");
+		// avoid leaving in a dirty state
+		SetupUtils::ExitMaintenanceMode(false);
+		SetupUtils::ExitReadOnlyMode(false);
 		SetupUtils::EraseSetupToken();
 	}