diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index fa5cf6391f2..31dce5b7ecc 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -89,15 +89,15 @@ else if ($_GET["action"] == 'disable_encrypt')
 
 if ($_GET["action"] == 'activate_encryptdbpassconf')
 {
-	dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 	$result = encodedecode_dbpassconf(1);
+	if ($result > 0) dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 	Header("Location: security.php");
 	exit;
 }
 else if ($_GET["action"] == 'disable_encryptdbpassconf')
 {
-	dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED");
 	$result = encodedecode_dbpassconf(0);
+	if ($result > 0) dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED");
   Header("Location: security.php");
   exit;
 }