diff --git a/ChangeLog b/ChangeLog
index c35ca9ba9b1..a8628cbd097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -250,6 +250,7 @@ Following changes may create regressions for some external modules, but were nec
 * Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
 * Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main"
 * Library htdocs/includes/phpoffice/phpexcel as been removed (replaced with htdocs/includes/phpoffice/PhpSpreadsheet)
+* Databse transaction in your triggers must be correctly balanced (one close for one open). If not, an error will be returned by the trigger, even if trigger did return error code.
 
 
 ***** ChangeLog for 12.0.4 compared to 12.0.3 *****
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 8f20ab43c84..a0dbe4e9838 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -66,6 +66,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if ($action != 'updateedit' && !$error)
 	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index bb4f142cc2a..9d715f92301 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -236,6 +236,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if (!$error)
 	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		$db->commit();
 	} else {
 		$db->rollback();
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index d50be27e97b..ec805f33281 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -57,6 +57,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if ($action != 'updateedit' && !$error)
 	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index d21b4bbb352..c38cf49d018 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -337,7 +337,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $result=GETPOST("param6", 'alpha');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('\'\'>', $result);
+        $this->assertEquals('>', $result);
 
         $result=GETPOST("param6", 'nohtml');
         print __METHOD__." result=".$result."\n";
@@ -351,7 +351,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         // With alphanohtml, we must convert the html entities like n
         $result=GETPOST("param8", 'alphanohtml');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals("Hacker<svg onload='console.log(''123'')'", $result);
+        $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
 
         $result=GETPOST("param9", 'alphanohtml');
         print __METHOD__." result=".$result."\n";