diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 7e2ca56994a6..830a8fc3156f 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -177,10 +177,7 @@ class PreviewController extends BaseController
 
     public function design(DesignPreviewRequest $request)
     {
-        // if (Ninja::isHosted() && !in_array($request->getHost(), ['preview.invoicing.co','staging.invoicing.co'])) {
-        //     return response()->json(['message' => 'This server cannot handle this request.'], 400);
-        // }
-
+        
         $pdf = (new PdfMock($request->all(), auth()->user()->company()))->build()->getPdf();
 
         $response = Response::make($pdf, 200);
diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index d9c2dab2d5c2..e54d76dd6881 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -302,13 +302,6 @@ class CheckoutComPaymentDriver extends BaseDriver
                 throw new PaymentFailed($human_exception);
             }
 
-
-
-            // catch (\Exception $e) {
-                //     // API error
-                //     throw new PaymentFailed($e->getMessage(), $e->getCode());
-            // }
-
             return $response;
         }
     }
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 5d10f2e74fff..4e54c27ee3f9 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -12,6 +12,7 @@
 namespace App\Services\Invoice;
 
 use App\DataMapper\InvoiceItem;
+use App\Events\Invoice\InvoiceWasPaid;
 use App\Events\Payment\PaymentWasCreated;
 use App\Factory\PaymentFactory;
 use App\Libraries\MultiDB;
@@ -225,6 +226,13 @@ class AutoBillInvoice extends AbstractService
         event('eloquent.created: App\Models\Payment', $payment);
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
+        //if we have paid the invoice in full using credits, then we need to fire the event
+        if($this->invoice->balance == 0){
+
+            event(new InvoiceWasPaid($this->invoice, $payment, $payment->company, Ninja::eventVars()));
+
+        }
+
         return $this->invoice
                     ->service()
                     ->setCalculatedStatus()
diff --git a/lang/en/texts.php b/lang/en/texts.php
index d9f1808be8d8..293868ade16e 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5043,6 +5043,9 @@ $LANG = array(
     'aged_receivable_summary_report' => 'Aged Receivable Summary Report',
     'taxable_amount' => 'Taxable Amount',
     'tax_summary' => 'Tax Summary',
+    'oauth_mail' => 'OAuth / Mail',
+    'preferences' => 'Preferences',
+    'analytics' => 'Analytics',
 );