diff --git a/config/services.yaml b/config/services.yaml
index 43fb74df..c2388e79 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -249,3 +249,19 @@ services:
             $base_url: "%env(MOTIV_BASE_URL)%"
             $sub_key: "%env(MOTIV_KEY)%"
             $token: "%env(MOTIV_TOKEN)%"
+
+    # entity listener for customer vehicle warranty code history
+    App\EntityListener\CustomerVehicleSerialListener:
+        arguments:
+            $ts: "@security.token_storage"
+        tags:
+            - name: doctrine.orm.entity_listener
+              event: 'preUpdate'
+              entity: 'App\Entity\CustomerVehicle'
+            - name: doctrine.orm.entity_listener
+              event: 'postUpdate'
+              entity: 'App\Entity\CustomerVehicle'
+            - name: doctrine.orm.entity_listener
+              event: 'postPersist'
+              entity: 'App\Entity\CustomerVehicle'
+
diff --git a/src/Entity/CVWarrantyHistory.php b/src/Entity/CVWarrantyHistory.php
index ec13e178..88ccc35a 100644
--- a/src/Entity/CVWarrantyHistory.php
+++ b/src/Entity/CVWarrantyHistory.php
@@ -83,7 +83,7 @@ class CVWarrantyHistory
 
 	public function setUser($user)
     {
-        $this->user;
+        $this->user = $user;
         return $this;
     }
 
diff --git a/src/EntityListener/CustomerVehicleSerialListener.php b/src/EntityListener/CustomerVehicleSerialListener.php
new file mode 100644
index 00000000..b19316e4
--- /dev/null
+++ b/src/EntityListener/CustomerVehicleSerialListener.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\EntityListener;
+
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\PreFlushEventArgs;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\EntityManagerInterface;
+
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+use App\Entity\CVWarrantyHistory;
+use App\Entity\CustomerVehicle;
+
+class CustomerVehicleSerialListener
+{
+	protected $ts;
+
+    public function __construct(TokenStorageInterface $ts)
+    {
+        $this->ts = $ts;
+
+        $this->history = null;
+    }
+
+    public function preUpdate(CustomerVehicle $cv, PreUpdateEventArgs $args)
+    {
+        // error_log('TRIGGER CV LISTENER - pre update');
+
+        // only check if warranty code field has changed
+        if ($args->hasChangedField('warranty_code'))
+        {
+            // error_log('warranty code has changed!');
+
+            $em = $args->getEntityManager();
+
+            // get user
+            $user = $this->ts->getToken()->getUser();
+
+            // error_log('user - ' . $user->getID());
+
+            // add history
+            $history = new CVWarrantyHistory();
+            $history->setCVID($cv->getID())
+                ->setWarrantyCode($cv->getWarrantyCode())
+                ->setUser($user);
+            $em->persist($history);
+
+            $this->history = $history;
+        }
+    }
+
+    public function postUpdate(CustomerVehicle $cv, LifecycleEventArgs $args)
+    {
+        if ($this->history != null)
+        {
+            $em = $args->getEntityManager();
+
+            $em->flush();
+        }
+    }
+
+    public function postPersist(CustomerVehicle $cv, LifecycleEventArgs $args)
+    {
+        // error_log('TRIGGER CV LISTENER - post persist');
+
+        $em = $args->getEntityManager();
+
+        // get user
+        $user = $this->ts->getToken()->getUser();
+
+        if ($cv->getWarrantyCode() == null)
+            $warr_code = '';
+        else
+            $warr_code = $cv->getWarrantyCode();
+
+        // add history
+        $history = new CVWarrantyHistory();
+        $history->setCVID($cv->getID())
+            ->setWarrantyCode($warr_code)
+            ->setUser($user);
+        $em->persist($history);
+
+        $em->flush();
+    }
+}
+