diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 283d9d62d81..6d935684aca 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -218,6 +218,10 @@ function conf($dolibarr_main_document_root)
 	$conf->db->character_set=$dolibarr_main_db_charset;
 	if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci';
 	$conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation;
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
 	// Forcage du log pour les install et mises a jour
 	$conf->syslog->enabled=1;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 6e1ac9411bc..aac7c468253 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -109,6 +109,11 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
 		}
 	}
 
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	
 	// Chargement config
 	if (! $error) $conf->setValues($db);