diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 3e01a99cb61..dcf980cf907 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -329,6 +329,7 @@ $securityevent = new Events($db);
 $eventstolog = $securityevent->eventstolog;
 
 print '<strong>'.$langs->trans("AuditedSecurityEvents").'</strong>: ';
+$out = '';
 if (!empty($eventstolog) && is_array($eventstolog)) {
 	// Loop on each event type
 	$i = 0;
@@ -338,18 +339,22 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 			$value = empty($conf->global->$key) ? '' : $conf->global->$key;
 			if ($value) {
 				if ($i > 0) {
-					print ', ';
+					$out .= ', ';
 				}
-				print '<span class="opacitymedium">'.$key.'</span>';
+				$out .= '<span class="opacitymedium">'.$key.'</span>';
 				$i++;
 			}
 		}
 	}
-	print '<br>';
-} else {
+	print $out;
+}
+
+if (empty($out)) {
 	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'<br>';
 }
 
+print '<br>';
+
 
 // Modules/Applications