diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php
index be96efc1a3..cce65f40d6 100644
--- a/app/Console/Commands/SendTestEmails.php
+++ b/app/Console/Commands/SendTestEmails.php
@@ -17,6 +17,10 @@ use App\Factory\ClientFactory;
 use App\Factory\InvoiceFactory;
 use App\Factory\InvoiceInvitationFactory;
 use App\Jobs\Invoice\CreateEntityPdf;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
+use App\Mail\DownloadInvoices;
+use App\Mail\Migration\MaxCompanies;
 use App\Mail\TemplateEmail;
 use App\Models\Account;
 use App\Models\Client;
@@ -60,9 +64,44 @@ class SendTestEmails extends Command
      */
     public function handle()
     {
-        $this->sendTemplateEmails('plain');
-        $this->sendTemplateEmails('light');
-        $this->sendTemplateEmails('dark');
+        $faker = Factory::create();
+
+        $account = Account::factory()->create();
+
+        $user = User::factory()->create([
+            'account_id' => $account->id,
+            'confirmation_code' => '123',
+            'email' => $faker->safeEmail,
+            'first_name' => 'John',
+            'last_name' => 'Doe',
+        ]);
+
+        $company = Company::factory()->create([
+            'account_id' => $account->id,
+        ]);
+
+        $user->companies()->attach($company->id, [
+            'account_id' => $account->id,
+            'is_owner' => 1,
+            'is_admin' => 1,
+            'is_locked' => 0,
+            'permissions' => '',
+            'notifications' => CompanySettings::notificationDefaults(),
+            //'settings' => DefaultSettings::userSettings(),
+            'settings' => null,
+        ]);
+
+        $nmo = new NinjaMailerObject;
+        $nmo->mailable = new DownloadInvoices('https://google.com', $user->account->companies()->first());
+        $nmo->company = $user->account->companies()->first();
+        $nmo->settings = $user->account->companies()->first()->settings;
+        $nmo->to_user = $user;
+
+        NinjaMailerJob::dispatch($nmo);
+
+        // $this->sendTemplateEmails('plain');
+        // $this->sendTemplateEmails('light');
+        // $this->sendTemplateEmails('dark');
     }
 
     private function sendTemplateEmails($template)
diff --git a/resources/views/email/migration/max_companies.blade.php b/resources/views/email/migration/max_companies.blade.php
index 4d76f055b9..a9cfad1d73 100644
--- a/resources/views/email/migration/max_companies.blade.php
+++ b/resources/views/email/migration/max_companies.blade.php
@@ -1,18 +1,6 @@
-@component('email.template.master', ['design' => 'light', 'settings' => $settings])
-
-    @slot('header')
-        @include('email.components.header', ['logo' => $logo])
-    @endslot
-
-    <h2>{{ctrans('texts.max_companies')}}</h2>
-
-    <p>{{ctrans('texts.max_companies_desc')}}</p>
-
-    @if(isset($whitelabel) && !$whitelabel)
-        @slot('footer')
-            @component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; InvoiceNinja'])
-                For any info, please visit InvoiceNinja.
-            @endcomponent
-        @endslot
-    @endif
+@component('email.template.admin-light', ['logo' => $logo, 'settings' => $settings])
+    <div class="center">
+        <h1>{{ ctrans('texts.max_companies') }}</h1>
+        <p>{{ ctrans('texts.max_companies_desc') }}</p>
+    </div>
 @endcomponent