diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 634b1c60886..2b70edd09ac 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -30,7 +30,7 @@
 
 include_once("./inc.php");
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index eaff3897738..3c3d9e53b76 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -39,7 +39,7 @@ error_reporting(0);
 set_time_limit(60);         
 error_reporting($err);
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 27643534444..a0ce6d5d491 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -31,7 +31,7 @@
 
 include_once("./inc.php");
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index df18d21b767..7c009eb8e40 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -30,7 +30,7 @@
 
 include_once("./inc.php");
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 1a82cb4c4c8..7f467064081 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -34,7 +34,7 @@ include_once("./inc.php");
 
 $err=0;
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("install");
@@ -226,7 +226,7 @@ Nom ou adresse ip du serveur de base de donn
 <td class="label" valign="top">
 <?php echo $langs->trans("Password"); ?>
 </td>
-<td class="label" valign="top"><input type="text" name="db_pass" value="<?php print isset($dolibarr_main_db_pass)?$dolibarr_main_db_pass:''; ?>"></td>
+<td class="label" valign="top"><input type="password" name="db_pass" value="<?php print isset($dolibarr_main_db_pass)?$dolibarr_main_db_pass:''; ?>"></td>
 <td class="comment">
 <?php echo $langs->trans("AdminPassword"); ?>
 </td>
diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php
index 09595e72c67..c51ff167d4b 100644
--- a/htdocs/install/licence.php
+++ b/htdocs/install/licence.php
@@ -30,7 +30,7 @@
 
 include_once("./inc.php");
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("install");
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 4941288aada..5232a8ecd5d 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -40,7 +40,7 @@ error_reporting(0);
 set_time_limit(60);         
 error_reporting($err);
 
-$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:$langcode);
+$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 575a352bc98..7c11beb7076 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -40,7 +40,7 @@ error_reporting(0);
 set_time_limit(60);
 error_reporting($err);
 
-$setuplang=isset($_POST['selectlang'])?$_POST['selectlang']:(isset($_GET['selectlang'])?$_GET['selectlang']:$langcode);
+$setuplang=isset($_POST['selectlang'])?$_POST['selectlang']:(isset($_GET['selectlang'])?$_GET['selectlang']:'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load('admin');