diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss
index ec26f1ebe5e..b5a2c33bb69 100644
--- a/build/exe/doliwamp/doliwamp2.4.iss
+++ b/build/exe/doliwamp/doliwamp2.4.iss
@@ -532,8 +532,12 @@ begin
     batFile := path+'\mysqlinitpassword.bat';
     Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
+    // Save result in a file
+//    destFile := pathWithSlashes+'/mysqlinitpassword.log';
+//    SaveStringToFile(destFile,myResult, False);
+
     // Remove dangerous files
-    batFile := path+'\removefiles.bat';
+//    batFile := path+'\removefiles.bat';
 //    Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
   end
diff --git a/build/exe/doliwamp/mysqlinitpassword.bat.install b/build/exe/doliwamp/mysqlinitpassword.bat.install
index 7a4cf535c78..4e728223fcd 100644
--- a/build/exe/doliwamp/mysqlinitpassword.bat.install
+++ b/build/exe/doliwamp/mysqlinitpassword.bat.install
@@ -1 +1,2 @@
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD
\ No newline at end of file
+sleep 1
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >>doliwamp.log 2>>&1
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 893277aa1df..c3a462f2cd3 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -39,6 +39,11 @@ $langs->load("install");
 
 dolibarr_install_syslog("check: Dolibarr install/upgrade process started");
 
+// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
+if (! isset($force_install_dolibarrlogin))     $force_install_dolibarrlogin='';
+if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+
+
 
 pHeader($langs->trans("DolibarrWelcome"),"");   // Etape suivante = license