diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index fe792bbebf2..a569c678a38 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -57,13 +57,19 @@ $pagenext = $page + 1;
 llxHeader();
 
 $userstatic=new User($db);
+$usefilter=0;
 
 $sql = "SELECT e.rowid, e.type, e.ip, ".$db->pdate("e.dateevent")." as dateevent,";
 $sql.= " e.fk_user, e.description,";
 $sql.= " u.login";
 $sql.= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
-$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= " WHERE 1=1";
+if ($_GET["search_code"]) { $usefilter++; $sql.=" AND e.type like '%".$_GET["search_code"]."%'"; }
+if ($_GET["search_ip"])   { $usefilter++; $sql.=" AND e.ip like '%".$_GET["search_ip"]."%'"; }
+if ($_GET["search_user"]) { $usefilter++; $sql.=" AND u.login like '%".$_GET["search_user"]."%'"; }
+if ($_GET["search_desc"]) { $usefilter++; $sql.=" AND e.description like '%".$_GET["search_desc"]."%'"; }
+$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
@@ -84,17 +90,27 @@ if ($result)
 	print '<td>&nbsp;</td>';
 	print "</tr>\n";
 
-/*
+
 	// Lignes des champs de filtre
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<tr class="liste_titre">';
 
 	print '<td class="liste_titre">&nbsp;</td>';
 
-	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_code" value="'.$_GET["search_code"].'">';
+	print '</td>';
 
 	print '<td align="left" class="liste_titre">';
-	print '<input class="flat" type="text" size="10" name="search_compta" value="'.$_GET["search_user"].'">';
+	print '<input class="flat" type="text" size="10" name="search_ip" value="'.$_GET["search_ip"].'">';
+	print '</td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_user" value="'.$_GET["search_user"].'">';
+	print '</td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_desc" value="'.$_GET["search_desc"].'">';
 	print '</td>';
 
 	print '<td align="right" class="liste_titre">';
@@ -103,7 +119,7 @@ if ($result)
 	
 	print "</tr>\n";
 	print '</form>';
-*/
+
 	$var=True;
 
 	while ($i < min($num,$conf->liste_limit))
@@ -144,7 +160,10 @@ if ($result)
 	}
 	
 	if ($num == 0)
-	print '<tr><td colspan="6">'.$langs->trans("NoEventOrNoAuditSetup").'</td></tr>';
+	{
+		if ($usefilter) print '<tr><td colspan="6">'.$langs->trans("NoEventFoundWithCriteria").'</td></tr>';
+		else print '<tr><td colspan="6">'.$langs->trans("NoEventOrNoAuditSetup").'</td></tr>';
+	}
 	print "</table>";
 	$db->free();
 }