diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index a959aee2e54..2f0978ed266 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -66,14 +66,29 @@ print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_
 print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0))."<br>\n";
 print '<br>';
 
+// XDebug
+print '<strong>'.$langs->trans("XDebug").'</strong>: ';
+$test = !function_exists('xdebug_is_enabled');
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+else {
+	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
+	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
+}
+print '<br>';
+
 print '<br>';
 print load_fiche_titre($langs->trans("ConfigFile"), '', '');
 
 print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
 if (empty($dolibarr_main_prod)) {
-	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis");
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
+}
+print '<br>';
+
+print '<strong>'.$langs->trans("dolibarr_nocsrfcheck").'</strong>: '.$dolibarr_nocsrfcheck;
+if (!empty($dolibarr_nocsrfcheck)) {
+	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 }
-// dolibarr_main_prod
 
 print '<br>';
 
@@ -94,20 +109,9 @@ print '<br>';
 print '<br>';
 
 print '<br>';
-print load_fiche_titre($langs->trans("Modules"), '', '');
-
-// XDebug
-print '<strong>'.$langs->trans("XDebug").'</strong>: ';
-$test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
-else {
-	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
-	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
-}
-print '<br>';
+print load_fiche_titre($langs->trans("DolibarrModules"), '', '');
 
 // Module log
-print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
@@ -118,7 +122,6 @@ else {
 print '<br>';
 
 // Module debugbar
-print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
@@ -130,7 +133,7 @@ print '<br>';
 
 print '<br>';
 print '<br>';
-print load_fiche_titre($langs->trans("SecuritySetup"), '', '');
+print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', '');
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
 print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.$conf->global->MAIN_SECURITY_HASH_ALGO." &nbsp; (Recommanded value: 'password_hash')<br>";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0309706312f..3da5c3aff62 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1679,11 +1679,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -2037,7 +2037,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property.
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export