diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index ac0c015e0be..205162a75c3 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -181,13 +181,17 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 				$numrows=$db->num_rows($resql);
 				if ($numrows == 0)
 				{
+					$salt = dol_print_date(dol_now(), 'dayhourlog');
+
 					// Define default setup for password encryption
 					dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
-					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
+					dolibarr_set_const($db, "MAIN_SECURITY_SALT", $salt, 'chaine', 0, '', 0);      // All entities
 					dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                               // All entities
 
-					// Update of $conf
-					$conf->setValues($db);
+					// Update of $conf->global
+					$conf->global->DATABASE_PWD_ENCRYPTED = 1;
+					$conf->global->MAIN_SECURITY_SALT = $salt;
+					$conf->global->MAIN_SECURITY_HASH_ALGO = 'sha1md5';
 				}
 			}