diff --git a/Config/config.xml b/Config/config.xml
index 3b6b5d14c..42168a46a 100644
--- a/Config/config.xml
+++ b/Config/config.xml
@@ -8,24 +8,6 @@
         <loop name="wishlist" class="WishList\Loop\WishList" />
     </loops>
 
-    <forms>
-        <!--
-        <form name="MyFormName" class="MyModule\Form\MySuperForm" />
-        -->
-    </forms>
-
-    <commands>
-        <!--
-        <command class="MyModule\Command\MySuperCommand" />
-        -->
-    </commands>
-
-    <templateDirectives>
-        <!-- Sample definition
-        <templateDirectives class="MyModule\Directive\MyTemplateDirective" name="my_filter"/>
-        -->
-    </templateDirectives>
-
     <services>
         <service id="wishList.smarty.plugin" class="WishList\Smarty\Plugins\WishList" scope="request">
             <argument type="service" id="request"/>
@@ -35,5 +17,11 @@
         <service id="wishList.action" class="WishList\Action\WishList">
             <tag name="kernel.event_subscriber"/>
         </service>
+
+        <service id="wishList.customer.listener" class="WishList\EventListener\CustomerListener">
+            <argument type="service" id="request_stack"/>
+            <argument type="service" id="thelia.securityContext"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 </config>
diff --git a/Config/module.xml b/Config/module.xml
index dd99482a4..003308b5e 100644
--- a/Config/module.xml
+++ b/Config/module.xml
@@ -7,12 +7,14 @@
     <descriptive locale="en_US">
         <title>Wish list</title>
     </descriptive>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <author>
         <name>Michaël Espeche</name>
         <email>mespeche@openstudio.fr</email>
+        <name>Gilles Bourgeat</name>
+        <email>gbourgeat@openstudio.fr</email>
     </author>
     <type>classic</type>
-    <thelia>2.1.0</thelia>
+    <thelia>2.3.0</thelia>
     <stability>prod</stability>
 </module>
\ No newline at end of file
diff --git a/EventListener/CustomerListener.php b/EventListener/CustomerListener.php
new file mode 100644
index 000000000..92542ce74
--- /dev/null
+++ b/EventListener/CustomerListener.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace WishList\EventListener;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Security\SecurityContext;
+use WishList\Controller\Front\WishListController;
+use WishList\Model\WishListQuery;
+
+/**
+ * @author Gilles Bourgeat <gbourgeat@openstudio.fr>
+ */
+class CustomerListener implements EventSubscriberInterface
+{
+    /** @var RequestStack */
+    protected $requestStack;
+
+    /** @var SecurityContext */
+    protected $securityContext;
+
+    public function __construct(RequestStack $requestStack, SecurityContext $securityContext)
+    {
+        $this->requestStack = $requestStack;
+        $this->securityContext = $securityContext;
+    }
+
+    public function customerLogout(Event $event)
+    {
+        $this->requestStack->getCurrentRequest()->getSession()->set(WishListController::SESSION_NAME, []);
+    }
+
+    public function customerLogin(Event $event)
+    {
+        if ($this->securityContext->hasCustomerUser()) {
+            $ids = WishListQuery::create()->filterByCustomerId($this->securityContext->getCustomerUser()->getId())->select('id')->find()->toArray();
+
+            $this->requestStack->getCurrentRequest()->getSession()->set(WishListController::SESSION_NAME, $ids);
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            TheliaEvents::CUSTOMER_LOGOUT => array("customerLogout", 128),
+            TheliaEvents::CUSTOMER_LOGIN => array("customerLogin", 64)
+        );
+    }
+}