diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php
index da82247805e..6256af29ecb 100644
--- a/htdocs/install/etape0.php
+++ b/htdocs/install/etape0.php
@@ -219,27 +219,6 @@ if (! $error && $db->connected)
 	
 	<tr><td align="center" class="label" colspan="3"><h3><?php echo $langs->trans("CharsetChoice");?></h3></td></tr>
 	
-	<tr>
-		<td valign="top" class="label"><?php echo $langs->trans("CharacterSetClient"); ?></td>
-		<td valign="top" class="label"><select name="character_set_client">
-		<option value="ISO-8859-1">ISO-8859-1</option>
-		<option value="UTF-8">UTF-8 <?php echo $langs->trans("Experimental") ?></option>
-<!--
-		<option>ISO-8859-15</option>
-		<option>cp866</option>
-		<option>cp1251</option>
-		<option>cp1252</option>
-		<option>KOI8-R</option>
-		<option>BIG5</option>
-		<option>GB2312</option>
-		<option>BIG5-HKSCS</option>
-		<option>Shift_JIS</option>
-		<option>EUC-JP</option>
--->
-		</select></td>
-		<td class="label"><div class="comment"><?php echo $langs->trans("CharacterSetClientComment"); ?></div></td>
-	</tr>
-
 	<?php
 	$defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
 	$defaultCollationConnection=$db->getDefaultCollationDatabase();
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index a73ac4c6353..3feabd98545 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -147,10 +147,6 @@ if ($_POST["action"] == "set")
 			fputs($fp, '$dolibarr_main_db_character_set="'.$_POST["character_set_database"].'";');
 			fputs($fp,"\n");
 			
-			/* Choix des charsets*/
-			fputs($fp, '$character_set_client="'.$_POST["character_set_client"].'";');
-			fputs($fp,"\n");
-			
 			fputs($fp, '$dolibarr_main_db_collation="'.$_POST["dolibarr_main_db_collation"].'";');
 			fputs($fp,"\n");
 
@@ -281,7 +277,7 @@ if ($_POST["action"] == "set")
 	*/
 	if (! $error)
 	{
-		conf($dolibarr_main_document_root );
+		conf($dolibarr_main_document_root);
 		
 		$userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:"";
 		$passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:"";
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 794c20b60af..92837a271e2 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -51,7 +51,7 @@ if ($dolibarr_main_db_type == "mysqli") $choix=1;
 if ($dolibarr_main_db_type == "pgsql")  $choix=2;
 if ($dolibarr_main_db_type == "mssql")  $choix=3;
 
-// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
+// Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard.
 if (file_exists("./install.forced.php")) include_once("./install.forced.php");
 
 dolibarr_install_syslog("etape2: Entering etape2.php page");
@@ -154,7 +154,8 @@ if ($_POST["action"] == "set")
                     
 	                //print "<tr><td>Creation de la table $name/td>";
 					$requestnb++;
-					if ($character_set_client=="UTF-8"){
+					if ($conf->character_set_client == "UTF-8")
+					{
 						$buffer=utf8_encode ($buffer);
 					}
 					
@@ -265,7 +266,8 @@ if ($_POST["action"] == "set")
 	                    {
 			                //print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
 							$requestnb++;
-							if ($character_set_client=="UTF-8"){
+							if ($conf->character_set_client == "UTF-8")
+							{
 								$buffer=utf8_encode ($buffer);
 							}
 							
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 854c3017fa1..f67e8a7ef42 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -109,9 +109,9 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
 if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; 
 define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:''));
 define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:''));
-if (! isset($conf->character_set_client))     $conf->character_set_client='iso-8859-1';
-if (! isset($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci';
-if (! isset($conf->db->user)) $conf->db->user='';
+if (empty($conf->character_set_client))     	  $conf->character_set_client=$charset;
+if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci';
+if (empty($conf->db->user)) $conf->db->user='';
 
 	
 // Security check
@@ -190,6 +190,7 @@ function conf($dolibarr_main_document_root)
 	global $dolibarr_main_db_name;
 	global $dolibarr_main_db_user;
 	global $dolibarr_main_db_pass;
+	global $character_set_client;
 
     $return=include_once($dolibarr_main_document_root."/conf/conf.class.php");
     if (! $return) return -1;
@@ -201,11 +202,12 @@ function conf($dolibarr_main_document_root)
 	$conf->db->name = trim($dolibarr_main_db_name);
 	$conf->db->user = trim($dolibarr_main_db_user);
 	$conf->db->pass = trim($dolibarr_main_db_pass);
-	if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1';
+
+	if (empty($character_set_client)) $character_set_client=$charset;
 	$conf->character_set_client=$character_set_client;
-	if (! isset($dolibarr_main_db_charset) || ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1'; 
+	if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1'; 
 	$conf->db->character_set=$dolibarr_main_db_charset;
-	if (! isset($dolibarr_main_db_collation) || ! $dolibarr_main_db_collation) $dolibarr_main_db_collation='latin1_swedish_ci';
+	if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci';
 	$conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation;
 
 	return 1;