diff --git a/app/Events/Subscription/SubscriptionWasArchived.php b/app/Events/Subscription/SubscriptionWasArchived.php
index 08811ecc7..1ac9cfd38 100644
--- a/app/Events/Subscription/SubscriptionWasArchived.php
+++ b/app/Events/Subscription/SubscriptionWasArchived.php
@@ -40,7 +40,7 @@ class SubscriptionWasArchived
      */
     public function __construct(Subscription $subscription, Company $company, array $event_vars)
     {
-        $this->task = $subscription;
+        $this->subscription = $subscription;
         $this->company = $company;
         $this->event_vars = $event_vars;
     }
diff --git a/app/Events/Subscription/SubscriptionWasDeleted.php b/app/Events/Subscription/SubscriptionWasDeleted.php
index 386bd5fa4..8a07faca3 100644
--- a/app/Events/Subscription/SubscriptionWasDeleted.php
+++ b/app/Events/Subscription/SubscriptionWasDeleted.php
@@ -40,7 +40,7 @@ class SubscriptionWasDeleted
      */
     public function __construct(Subscription $subscription, Company $company, array $event_vars)
     {
-        $this->task = $subscription;
+        $this->subscription = $subscription;
         $this->company = $company;
         $this->event_vars = $event_vars;
     }
diff --git a/app/Events/Subscription/SubscriptionWasRestored.php b/app/Events/Subscription/SubscriptionWasRestored.php
index fdf56706f..a4af59333 100644
--- a/app/Events/Subscription/SubscriptionWasRestored.php
+++ b/app/Events/Subscription/SubscriptionWasRestored.php
@@ -41,7 +41,7 @@ class SubscriptionWasRestored
      */
     public function __construct(Subscription $subscription, $fromDeleted, Company $company, array $event_vars)
     {
-        $this->task = $subscription;
+        $this->subscription = $subscription;
         $this->fromDeleted = $fromDeleted;
         $this->company = $company;
         $this->event_vars = $event_vars;
diff --git a/app/Events/Subscription/SubscriptionWasUpdated.php b/app/Events/Subscription/SubscriptionWasUpdated.php
index 694f32f9c..b271458c0 100644
--- a/app/Events/Subscription/SubscriptionWasUpdated.php
+++ b/app/Events/Subscription/SubscriptionWasUpdated.php
@@ -40,7 +40,7 @@ class SubscriptionWasUpdated
      */
     public function __construct(Subscription $subscription, Company $company, array $event_vars)
     {
-        $this->task = $subscription;
+        $this->subscription = $subscription;
         $this->company = $company;
         $this->event_vars = $event_vars;
     }
diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php
index e6634272c..4d7219392 100644
--- a/app/Http/Controllers/Shop/InvoiceController.php
+++ b/app/Http/Controllers/Shop/InvoiceController.php
@@ -85,7 +85,7 @@ class InvoiceController extends BaseController
 
         $invoice = $invoice->service()->triggeredActions($request)->save();
 
-        event(new InvoiceWasCreated($invoice, $company, Ninja::eventVars(auth()->user()->id)));
+        event(new InvoiceWasCreated($invoice, $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($invoice);
     }
diff --git a/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php b/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php
new file mode 100644
index 000000000..9b8a389ac
--- /dev/null
+++ b/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSubscriptionIdToActivitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            $table->unsignedInteger('subscription_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            //
+        });
+    }
+}