diff --git a/app/Listeners/InvoiceListener.php b/app/Listeners/InvoiceListener.php
index 55759ba82ff8..ac4918af1d2a 100644
--- a/app/Listeners/InvoiceListener.php
+++ b/app/Listeners/InvoiceListener.php
@@ -1,7 +1,10 @@
 <?php namespace app\Listeners;
 
+use Utils;
+use Auth;
 use App\Events\InvoiceWasEmailed;
 use App\Events\InvoiceWasUpdated;
+use App\Events\InvoiceWasCreated;
 use App\Events\PaymentWasCreated;
 use App\Events\PaymentWasDeleted;
 use App\Events\PaymentWasRestored;
@@ -9,15 +12,19 @@ use App\Events\InvoiceInvitationWasViewed;
 
 class InvoiceListener
 {
-    public function createdPayment(PaymentWasCreated $event)
+    public function createdInvoice(InvoiceWasCreated $event)
     {
-        $payment = $event->payment;
-        $invoice = $payment->invoice;
-        $adjustment = $payment->amount * -1;
-        $partial = max(0, $invoice->partial - $payment->amount);
+        if (Utils::isPro()) {
+            return;
+        }
 
-        $invoice->updateBalances($adjustment, $partial);
-        $invoice->updatePaidStatus();
+        $invoice = $event->invoice;
+        $account = Auth::user()->account;
+
+        if ($account->invoice_design_id != $invoice->invoice_design_id) {
+            $account->invoice_design_id = $invoice->invoice_design_id;
+            $account->save();
+        }
     }
 
     public function updatedInvoice(InvoiceWasUpdated $event)
@@ -32,6 +39,17 @@ class InvoiceListener
         $invitation->markViewed();
     }
 
+    public function createdPayment(PaymentWasCreated $event)
+    {
+        $payment = $event->payment;
+        $invoice = $payment->invoice;
+        $adjustment = $payment->amount * -1;
+        $partial = max(0, $invoice->partial - $payment->amount);
+
+        $invoice->updateBalances($adjustment, $partial);
+        $invoice->updatePaidStatus();
+    }
+
     public function deletedPayment(PaymentWasDeleted $event)
     {
         $payment = $event->payment;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 7e0743d501c4..37a09fbc44ca 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -31,6 +31,7 @@ class EventServiceProvider extends ServiceProvider {
         'App\Events\InvoiceWasCreated' => [
             'App\Listeners\ActivityListener@createdInvoice',
             'App\Listeners\SubscriptionListener@createdInvoice',
+            'App\Listeners\InvoiceListener@createdInvoice',
         ],
         'App\Events\InvoiceWasUpdated' => [
             'App\Listeners\ActivityListener@updatedInvoice',