diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index c05ff750c44a..f288b1b9f52f 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -152,7 +152,7 @@ class CreateCompany
 
             $company->save();
 
-            $user = $company->account->users()->first();
+            $user = $this->account->users()->orderBy('id','asc')->first();
 
             $tax_rate = TaxRateFactory::create($company->id, $user->id);
             $tax_rate->name = $company->tax_data->regions->EU->subregions->ES->tax_name;
diff --git a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
index 1cf801afec62..9b41a3b096b6 100644
--- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
+++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
@@ -46,12 +46,21 @@ class InvoiceReminderEmailActivity implements ShouldQueue
 
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
+        $reminder = match($event->template){
+            'reminder1' => 63,
+            'reminder2' => 64,
+            'reminder3' => 65,
+            'reminder_endless' => 66,
+            'endless_reminder' => 66,
+            default => 6,
+        };
+
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice_id;
         $fields->company_id = $event->invitation->company_id;
         $fields->client_contact_id = $event->invitation->client_contact_id;
         $fields->client_id = $event->invitation->invoice->client_id;
-        $fields->activity_type_id = $event->reminder;
+        $fields->activity_type_id = $reminder;
 
         $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
     }
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 54d37fb968ca..dfdf67c2691a 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -824,7 +824,7 @@ class Invoice extends BaseModel
             case 'custom1':
             case 'custom2':
             case 'custom3':
-                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), $template));
+                event(new InvoiceWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), $template));
                 break;
             default:
                 // code...