diff --git a/lib/models/Message.class.php b/lib/models/Message.class.php
index 0c03215ea809058cf59723bdd7d247acd49b13bc..32cd7d48cb985f131e122bc0a8a4f2e77c5b32e7 100644
--- a/lib/models/Message.class.php
+++ b/lib/models/Message.class.php
@@ -227,7 +227,9 @@ class Message extends SimpleORMap implements PrivacyObject
 
     public static function send($sender, $recipients, $subject, $message)
     {
-
+        if ($sender === 'cli') {
+            $sender = '____%system%____';
+        }
         $messaging = new \messaging();
         $result = $messaging->insert_message($message,
                                              $recipients,