diff --git a/app/Listeners/SubscriptionListener.php b/app/Listeners/SubscriptionListener.php
index 8b0a231560f4..72de6ef1b893 100644
--- a/app/Listeners/SubscriptionListener.php
+++ b/app/Listeners/SubscriptionListener.php
@@ -18,43 +18,28 @@ class SubscriptionListener
 {
     public function createdClient(ClientWasCreated $event)
     {
-        if ( ! Auth::check()) {
-            return;
-        }
-        $transformer = new ClientTransformer(Auth::user()->account);
+        $transformer = new ClientTransformer($event->client->account);
         $this->checkSubscriptions(ACTIVITY_TYPE_CREATE_CLIENT, $event->client, $transformer);
     }
     public function createdQuote(QuoteWasCreated $event)
     {
-        if ( ! Auth::check()) {
-            return;
-        }
-        $transformer = new InvoiceTransformer(Auth::user()->account);
+        $transformer = new InvoiceTransformer($event->quote->account);
         $this->checkSubscriptions(ACTIVITY_TYPE_CREATE_QUOTE, $event->quote, $transformer, ENTITY_CLIENT);
     }
     public function createdPayment(PaymentWasCreated $event)
     {
-        if ( ! Auth::check()) {
-            return;
-        }
-        $transformer = new PaymentTransformer(Auth::user()->account);
+        $transformer = new PaymentTransformer($event->payment->account);
         $this->checkSubscriptions(ACTIVITY_TYPE_CREATE_PAYMENT, $event->payment, $transformer, [ENTITY_CLIENT, ENTITY_INVOICE]);
     }
-    public function createdCredit(CreditWasCreated $event)
-    {
-        if ( ! Auth::check()) {
-            return;
-        }
-        //$this->checkSubscriptions(ACTIVITY_TYPE_CREATE_CREDIT, $event->credit);
-    }
     public function createdInvoice(InvoiceWasCreated $event)
     {
-        if ( ! Auth::check()) {
-            return;
-        }
-        $transformer = new InvoiceTransformer(Auth::user()->account);
+        $transformer = new InvoiceTransformer($event->invoice->account);
         $this->checkSubscriptions(ACTIVITY_TYPE_CREATE_INVOICE, $event->invoice, $transformer, ENTITY_CLIENT);
     }
+    public function createdCredit(CreditWasCreated $event)
+    {
+        //$this->checkSubscriptions(ACTIVITY_TYPE_CREATE_CREDIT, $event->credit);
+    }
     public function createdVendor(VendorWasCreated $event)
     {
         //$this->checkSubscriptions(ACTIVITY_TYPE_CREATE_VENDOR, $event->vendor);
@@ -72,6 +57,10 @@ class SubscriptionListener
             $manager->parseIncludes($include);
             $resource = new Item($entity, $transformer, $entity->getEntityType());
             $data = $manager->createData($resource)->toArray();
+            // For legacy Zapier support
+            if (isset($data['client_id'])) {
+                $data['client_name'] = $entity->client->getDisplayName();
+            }
             Utils::notifyZapier($subscription, $data);
         }
     }