diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 68a0274ec9e..1adeefca344 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -219,7 +219,9 @@ if ($_POST["action"] == "set")
                         }
                         else
                         {
-                            if ($db->errno() == 'DB_ERROR_CANNOT_CREATE' || eregi('duplicate key name',$db->error()))
+                            if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
+                                $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
+                                eregi('duplicate key name',$db->error()))
                             {
                                 //print "<td>Déjà existante</td></tr>";
                                 $key_exists = 1;
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index c7a0c216f35..2a194b56726 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -122,12 +122,18 @@ if ($_POST["action"] == "set")
 
 print "<br>";
 
+// Fin install
 print $langs->trans("SystemIsInstalled")."<br>";
-print $langs->trans("YouNeedToPersonalizeSetup")."<br>";
+print $langs->trans("WarningRemoveInstallDir")."<br>";
 
-print '<br><a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup">';
+print "<br>";
+
+// Lien vers setup
+print $langs->trans("YouNeedToPersonalizeSetup")."<br>";
+print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup">';
 print $langs->trans("GoToSetupArea");
 print '</a>';
 
+
 pFooter(1);
 ?>