diff --git a/lib/models/Message.class.php b/lib/models/Message.class.php
index a384f6459a2dd8867143eb87a1929adf52487691..05cfc39feb29868f9f1117cc02f58a6de960580a 100644
--- a/lib/models/Message.class.php
+++ b/lib/models/Message.class.php
@@ -229,7 +229,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,