diff --git a/config/module.config.php b/config/module.config.php
index a5df943e1b6f3564f554614e0487f61b991d21d9..e0b80300c8d283b25ad59329c73f5392020f7b84 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -369,6 +369,10 @@ return [
             'UnicaenAuth\Provider\Role\Username'       => 'UnicaenAuth\Provider\Role\UsernameServiceFactory',
             'BjyAuthorize\Service\Authorize'           => 'UnicaenAuth\Service\AuthorizeServiceFactory', // substituion
             'zfcuser_redirect_callback'                => 'UnicaenAuth\Authentication\RedirectCallbackFactory', // substituion
+            'MouchardCompleterAuth'        => 'UnicaenAuth\Mouchard\MouchardCompleterAuthFactory',
+        ],
+        'shared' => [
+            'MouchardCompleterAuth'        => false,
         ],
         'initializers'       => [
             'UnicaenAuth\Service\UserAwareInitializer',
diff --git a/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php b/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php
new file mode 100644
index 0000000000000000000000000000000000000000..a310fd1e128e189f8f926ace89023ae144458f1c
--- /dev/null
+++ b/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace UnicaenAuth\Mouchard;
+
+use UnicaenApp\Mouchard\MouchardCompleterInterface;
+use UnicaenApp\Mouchard\MouchardMessage;
+use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
+use Zend\Mvc\Application;
+
+/**
+ * Interface MouchardCompleterInterface
+ *
+ * @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
+ * @package UnicaenApp\Mouchard
+ */
+class MouchardCompleterAuth implements MouchardCompleterInterface
+{
+    use UserContextServiceAwareTrait;
+
+    /**
+     * @return $this
+     */
+    public function complete(MouchardMessage $message)
+    {
+        $message->setUser((string)$this->getServiceUserContext()->getDbUser()->getDisplayName());
+        $message->setRole((string)$this->getServiceUserContext()->getSelectedIdentityRole());
+
+        return $this;
+    }
+
+}
\ No newline at end of file
diff --git a/src/UnicaenAuth/Mouchard/MouchardCompleterAuthFactory.php b/src/UnicaenAuth/Mouchard/MouchardCompleterAuthFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbbeeca7b52f4d3e23190b50f98433fc63c09ec3
--- /dev/null
+++ b/src/UnicaenAuth/Mouchard/MouchardCompleterAuthFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace UnicaenAuth\Mouchard;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Description of MouchardCompleterAuthFactory
+ *
+ * @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
+ */
+class MouchardCompleterAuthFactory implements FactoryInterface
+{
+    /**
+     * Create service
+     *
+     * @param ServiceLocatorInterface $serviceLocator
+     * @return MouchardCompleterAuth
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $mouchardCompleterAuth = new MouchardCompleterAuth();
+
+        $serviceUserContext = $serviceLocator->get('UnicaenAuth\Service\UserContext');
+        $mouchardCompleterAuth->setServiceUserContext($serviceUserContext);
+
+        return $mouchardCompleterAuth;
+    }
+}
\ No newline at end of file