diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss
index 751bd2dc4a6..64ac0bbf428 100644
--- a/build/exe/doliwamp/doliwamp2.4.iss
+++ b/build/exe/doliwamp/doliwamp2.4.iss
@@ -14,7 +14,7 @@ SourceDir=E:\Mes Developpements\dolibarr
 ; ----- End of change
 AppId=doliwamp
 AppPublisher=Laurent Destailleur - NLTechno
-AppPublisherURL=http://www.dolibarr.org
+AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
@@ -44,6 +44,7 @@ Name: "desktopicon"; Description: "Create a &Desktop icon"; GroupDescription: "A
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
+Name: "{app}\bin\apache\apache2.2.6\logs"
 
 [Files]
 ; Stop/start
@@ -549,27 +550,22 @@ DeleteFile(SrcFile);
 
 
   // Install services
-  //Filename: "{app}\uninstall_services.bat"; Flags: runhidden waituntilterminated
   batFile := path+'\uninstall_services.bat';
   Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
-  //Filename: "{app}\install_services.bat"; Flags: runhidden waituntilterminated
   batFile := path+'\install_services.bat';
   Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
   // Stard services
-  //Filename: "{app}\startdoliwamp.bat"; Flags: runhidden waituntilterminated
   batFile := path+'\startdoliwamp.bat';
   Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
   // Change mysql password
-  //Filename: "{app}\mysqlinitpassword.bat"; Flags: runhidden waituntilterminated
   batFile := path+'\mysqlinitpassword.bat';
   Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
-  // Remove bat file
-  //Filename: "{app}\removefiles.bat"; Flags: runhidden waituntilterminated
-  //  batFile := path+'\removefiles.bat';
-  //  Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
+  // Remove dangerous files
+  batFile := path+'\removefiles.bat';
+  Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 
   end
 
@@ -678,6 +674,9 @@ Filename: "{app}\rundoliwamp.bat"; Description: "Launch Dolibarr now"; Flags: sh
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
+Type: files; Name: "{app}\www\dolibarr\htdocs\conf\conf.php"
+Type: files; Name: "{app}\www\dolibarr\htdocs\install\install.forced.php"
+Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"
 Type: filesandordirs; Name: "{app}\bin\php"
diff --git a/build/exe/doliwamp/removefiles.bat b/build/exe/doliwamp/removefiles.bat
index 75f328eae12..81547e7bd05 100644
--- a/build/exe/doliwamp/removefiles.bat
+++ b/build/exe/doliwamp/removefiles.bat
@@ -1 +1,3 @@
-del /F .\mysqlinitpassword.bat
\ No newline at end of file
+@echo off
+del /F .\mysqlinitpassword.bat
+rename .\www\dolibarr\htdocs\install install.norun
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index ea25392c65e..eca449c8b4a 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -39,32 +39,37 @@ $success=0;
 dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
 
 
+// If install, check pass and pass_verif used to create admin account
+if ($_POST["action"] == "set")
+{
+	if ($_POST["pass"] <> $_POST["pass_verif"])
+	{
+		Header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+		exit;
+	}
+
+	if (strlen(trim($_POST["pass"])) == 0)
+	{
+		Header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+		exit;
+	}
+
+	if (strlen(trim($_POST["login"])) == 0)
+	{
+		Header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+		exit;
+	}
+}
+
+
+/*
+*	View
+*/
+
+pHeader($langs->trans("SetupEnd"),"etape5");
+
 if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
 {
-    // If install, check pass and pass_verif used to create admin account
-    if ($_POST["action"] == "set")
-    {
-        if ($_POST["pass"] <> $_POST["pass_verif"])
-        {
-            Header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
-            exit;
-        }
-    
-        if (strlen(trim($_POST["pass"])) == 0)
-        {
-            Header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
-            exit;
-        }
-    
-        if (strlen(trim($_POST["login"])) == 0)
-        {
-            Header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
-            exit;
-        }
-    }
-    
-
-    pHeader($langs->trans("SetupEnd"),"etape5");
 
     print '<table cellspacing="0" cellpadding="2" width="100%">';
     $error=0;