diff --git a/app/Listeners/SubscriptionListener.php b/app/Listeners/SubscriptionListener.php
index 1098869c7748..8b0a231560f4 100644
--- a/app/Listeners/SubscriptionListener.php
+++ b/app/Listeners/SubscriptionListener.php
@@ -72,10 +72,6 @@ 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);
         }
     }
diff --git a/app/Services/InvoiceService.php b/app/Services/InvoiceService.php
index 839c6fa6adf3..c5d6f258e02c 100644
--- a/app/Services/InvoiceService.php
+++ b/app/Services/InvoiceService.php
@@ -79,7 +79,8 @@ class InvoiceService extends BaseService
 
     public function approveQuote($quote, $invitation = null)
     {
-        $account = Auth::user()->account;
+        $account = $quote->account;
+        
         if (!$quote->is_quote || $quote->quote_invoice_id) {
             return null;
         }
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 3c2ec0580feb..80289bfa29f0 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -1121,7 +1121,7 @@ return array(
     'all_pages_header' => 'Show header on',
     'all_pages_footer' => 'Show footer on',
     'invoice_currency' => 'Rechnungs-Währung',
-    'enable_https' => 'Wir empfehlen dringend HTTPS zu verwendne, um Kreditkarten online zu akzeptieren.',
+    'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Währungscode',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',