diff --git a/app/Http/Livewire/Settings/Email.php b/app/Http/Livewire/Settings/Email.php
index dd6a31fa7..b82982a6a 100644
--- a/app/Http/Livewire/Settings/Email.php
+++ b/app/Http/Livewire/Settings/Email.php
@@ -47,9 +47,9 @@ class Email extends Component
             $this->validate();
         }
     }
-    public function test_email()
+    public function testNotification()
     {
-        Notification::send($this->settings, new TestEmail);
+        $this->settings->notify(new TestEmail);
         $this->emit('success', 'Test email sent.');
     }
     private function decrypt()
diff --git a/app/Notifications/TransactionalEmails/TestEmail.php b/app/Notifications/TransactionalEmails/TestEmail.php
index 19e45dfc2..4dbd7f1c3 100644
--- a/app/Notifications/TransactionalEmails/TestEmail.php
+++ b/app/Notifications/TransactionalEmails/TestEmail.php
@@ -3,7 +3,6 @@
 namespace App\Notifications\TransactionalEmails;
 
 use App\Notifications\Channels\EmailChannel;
-use App\Notifications\Channels\TransactionalEmailChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -19,7 +18,7 @@ class TestEmail extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject('Coolify Test Notification');
+        $mail->subject('Test Notification');
         $mail->view('emails.test');
         return $mail;
     }
diff --git a/resources/views/emails/test.blade.php b/resources/views/emails/test.blade.php
index c06e333f0..63b0b45cc 100644
--- a/resources/views/emails/test.blade.php
+++ b/resources/views/emails/test.blade.php
@@ -1,3 +1 @@
-Hello,<br><br>
-
 If you are seeing this, it means that your SMTP settings are correct.
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index 406c7ce6b..f0e4d1ed5 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -35,17 +35,15 @@
             <x-forms.input helper="If SMTP through SSL, set it to 'tls'." placeholder="tls" id="model.smtp.encryption"
                 label="Encryption" />
         </div>
-        <div class="flex flex-col">
-            <div class="flex flex-col gap-2 xl:flex-row">
-                <x-forms.input id="model.smtp.username" helper="SMTP Username" label="Username" />
-                <x-forms.input type="password" helper="SMTP Password" id="model.smtp.password" label="Password" />
-            </div>
+        <div class="flex flex-col gap-2 xl:flex-row">
+            <x-forms.input id="model.smtp.username" helper="SMTP Username" label="SMTP Username" />
+            <x-forms.input type="password" helper="SMTP Password" id="model.smtp.password" label="SMTP Password" />
             <x-forms.input id="model.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" />
-            <div class="flex flex-col gap-2 xl:flex-row">
-                <x-forms.input required id="model.smtp.from_name" helper="Name used in emails." label="From Name" />
-                <x-forms.input required id="model.smtp.from_address" helper="Email address used in emails."
-                    label="From Address" />
-            </div>
+        </div>
+        <div class="flex flex-col gap-2 xl:flex-row">
+            <x-forms.input required id="model.smtp.from_name" helper="Name used in emails." label="From Name" />
+            <x-forms.input required id="model.smtp.from_address" helper="Email address used in emails."
+                label="From Address" />
         </div>
     </form>
     @if (data_get($model, 'smtp.enabled'))
diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php
index c8a9bbbcc..d1cb2bdb0 100644
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -5,6 +5,11 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
+            @if ($settings->smtp->enabled)
+                <x-forms.button isHighlighted wire:click='testNotification'>
+                    Send Test Email
+                </x-forms.button>
+            @endif
         </div>
         <div class="pt-2 pb-4 ">SMTP settings for password resets, invitations, etc.</div>
         <div class="w-32">
@@ -13,31 +18,24 @@
         <div class="flex items-end gap-2">
             <x-forms.input id="settings.smtp.test_recipients" label="Test Recipients"
                 helper="Email list to send a test email to, separated by comma." />
-            @if ($settings->smtp->enabled)
-                <x-forms.button wire:click='test_email'>
-                    Send Test Email
-                </x-forms.button>
-            @endif
+
         </div>
-        <div class="flex flex-col gap-2 xl:flex-row">
-            <div class="flex flex-col w-full">
-                <x-forms.input required id="settings.smtp.host" helper="SMTP Hostname" placeholder="smtp.mailgun.org"
-                    label="Host" />
-                <x-forms.input required id="settings.smtp.port" helper="SMTP Port" placeholder="587" label="Port" />
-                <x-forms.input id="settings.smtp.encryption" helper="If SMTP through SSL, set it to 'tls'."
-                    placeholder="tls" label="Encryption" />
-            </div>
-            <div class="flex flex-col w-full">
-                <x-forms.input id="settings.smtp.username" helper="SMTP Username" label="SMTP Username" />
-                <x-forms.input id="settings.smtp.password" type="password" helper="SMTP Password"
-                    label="SMTP Password" />
-                <x-forms.input id="settings.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" />
-            </div>
-            <div class="flex flex-col w-full">
-                <x-forms.input required id="settings.smtp.from_name" helper="Name used in emails." label="From Name" />
-                <x-forms.input required id="settings.smtp.from_address" helper="Email address used in emails."
-                    label="From Address" />
-            </div>
+        <div class="flex flex-col w-full gap-2 xl:flex-row">
+            <x-forms.input required id="settings.smtp.host" helper="SMTP Hostname" placeholder="smtp.mailgun.org"
+                label="Host" />
+            <x-forms.input required id="settings.smtp.port" helper="SMTP Port" placeholder="587" label="Port" />
+            <x-forms.input id="settings.smtp.encryption" helper="If SMTP through SSL, set it to 'tls'."
+                placeholder="tls" label="Encryption" />
+        </div>
+        <div class="flex flex-col w-full gap-2 xl:flex-row">
+            <x-forms.input id="settings.smtp.username" helper="SMTP Username" label="SMTP Username" />
+            <x-forms.input id="settings.smtp.password" type="password" helper="SMTP Password" label="SMTP Password" />
+            <x-forms.input id="settings.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" />
+        </div>
+        <div class="flex flex-col w-full gap-2 xl:flex-row">
+            <x-forms.input required id="settings.smtp.from_name" helper="Name used in emails." label="From Name" />
+            <x-forms.input required id="settings.smtp.from_address" helper="Email address used in emails."
+                label="From Address" />
         </div>
     </form>
 </div>