diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php
index fe329f270..2a017ed34 100644
--- a/app/Livewire/SettingsEmail.php
+++ b/app/Livewire/SettingsEmail.php
@@ -3,102 +3,83 @@
 namespace App\Livewire;
 
 use App\Models\InstanceSettings;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class SettingsEmail extends Component
 {
     public InstanceSettings $settings;
 
-    public string $emails;
+    #[Rule(['boolean'])]
+    public bool $smtpEnabled = false;
 
-    protected $rules = [
-        'settings.smtp_enabled' => 'nullable|boolean',
-        'settings.smtp_host' => 'required',
-        'settings.smtp_port' => 'required|numeric',
-        'settings.smtp_encryption' => 'nullable',
-        'settings.smtp_username' => 'nullable',
-        'settings.smtp_password' => 'nullable',
-        'settings.smtp_timeout' => 'nullable',
-        'settings.smtp_from_address' => 'required|email',
-        'settings.smtp_from_name' => 'required',
-        'settings.resend_enabled' => 'nullable|boolean',
-        'settings.resend_api_key' => 'nullable',
+    #[Rule(['nullable', 'string'])]
+    public ?string $smtpHost = null;
 
-    ];
+    #[Rule(['nullable', 'numeric', 'min:1', 'max:65535'])]
+    public ?int $smtpPort = null;
 
-    protected $validationAttributes = [
-        'settings.smtp_from_address' => 'From Address',
-        'settings.smtp_from_name' => 'From Name',
-        'settings.smtp_recipients' => 'Recipients',
-        'settings.smtp_host' => 'Host',
-        'settings.smtp_port' => 'Port',
-        'settings.smtp_encryption' => 'Encryption',
-        'settings.smtp_username' => 'Username',
-        'settings.smtp_password' => 'Password',
-        'settings.smtp_timeout' => 'Timeout',
-        'settings.resend_api_key' => 'Resend API Key',
-    ];
+    #[Rule(['nullable', 'string'])]
+    public ?string $smtpEncryption = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $smtpUsername = null;
+
+    #[Rule(['nullable'])]
+    public ?string $smtpPassword = null;
+
+    #[Rule(['nullable', 'numeric'])]
+    public ?int $smtpTimeout = null;
+
+    #[Rule(['nullable', 'email'])]
+    public ?string $smtpFromAddress = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $smtpFromName = null;
+
+    #[Rule(['boolean'])]
+    public bool $resendEnabled = false;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $resendApiKey = null;
 
     public function mount()
     {
-        if (isInstanceAdmin()) {
-            $this->settings = instanceSettings();
-            $this->emails = auth()->user()->email;
-        } else {
+        if (isInstanceAdmin() === false) {
             return redirect()->route('dashboard');
         }
+        $this->settings = instanceSettings();
+        $this->syncData();
     }
 
-    public function submitFromFields()
+    public function syncData(bool $toModel = false)
     {
-        try {
-            $this->resetErrorBag();
-            $this->validate([
-                'settings.smtp_from_address' => 'required|email',
-                'settings.smtp_from_name' => 'required',
-            ]);
+        if ($toModel) {
+            $this->validate();
+            $this->settings->smtp_enabled = $this->smtpEnabled;
+            $this->settings->smtp_host = $this->smtpHost;
+            $this->settings->smtp_port = $this->smtpPort;
+            $this->settings->smtp_encryption = $this->smtpEncryption;
+            $this->settings->smtp_username = $this->smtpUsername;
+            $this->settings->smtp_password = $this->smtpPassword;
+            $this->settings->smtp_timeout = $this->smtpTimeout;
+
+            $this->settings->resend_enabled = $this->resendEnabled;
+            $this->settings->resend_api_key = $this->resendApiKey;
             $this->settings->save();
-            $this->dispatch('success', 'Settings saved.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
+        } else {
+            $this->smtpEnabled = $this->settings->smtp_enabled;
+            $this->smtpHost = $this->settings->smtp_host;
+            $this->smtpPort = $this->settings->smtp_port;
+            $this->smtpEncryption = $this->settings->smtp_encryption;
+            $this->smtpUsername = $this->settings->smtp_username;
+            $this->smtpPassword = $this->settings->smtp_password;
+            $this->smtpTimeout = $this->settings->smtp_timeout;
+            $this->smtpFromAddress = $this->settings->smtp_from_address;
+            $this->smtpFromName = $this->settings->smtp_from_name;
 
-    public function submitResend()
-    {
-        try {
-            $this->resetErrorBag();
-            $this->validate([
-                'settings.smtp_from_address' => 'required|email',
-                'settings.smtp_from_name' => 'required',
-                'settings.resend_api_key' => 'required',
-            ]);
-            $this->settings->save();
-            $this->dispatch('success', 'Settings saved.');
-        } catch (\Throwable $e) {
-            $this->settings->resend_enabled = false;
-
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSaveResend()
-    {
-        try {
-            $this->settings->smtp_enabled = false;
-            $this->submitResend();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSave()
-    {
-        try {
-            $this->settings->resend_enabled = false;
-            $this->submit();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
+            $this->resendEnabled = $this->settings->resend_enabled;
+            $this->resendApiKey = $this->settings->resend_api_key;
         }
     }
 
@@ -106,20 +87,29 @@ class SettingsEmail extends Component
     {
         try {
             $this->resetErrorBag();
-            $this->validate([
-                'settings.smtp_from_address' => 'required|email',
-                'settings.smtp_from_name' => 'required',
-                'settings.smtp_host' => 'required',
-                'settings.smtp_port' => 'required|numeric',
-                'settings.smtp_encryption' => 'nullable',
-                'settings.smtp_username' => 'nullable',
-                'settings.smtp_password' => 'nullable',
-                'settings.smtp_timeout' => 'nullable',
-            ]);
-            $this->settings->save();
+            $this->syncData(true);
             $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
+
+    public function instantSave(string $type)
+    {
+        try {
+            if ($type === 'SMTP') {
+                $this->resendEnabled = false;
+            } else {
+                $this->smtpEnabled = false;
+            }
+            $this->syncData(true);
+            if ($this->smtpEnabled || $this->resendEnabled) {
+                $this->dispatch('success', "{$type} enabled.");
+            } else {
+                $this->dispatch('success', "{$type} disabled.");
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
 }
diff --git a/resources/views/livewire/settings-email.blade.php b/resources/views/livewire/settings-email.blade.php
index c36e98808..ff3e4bfb8 100644
--- a/resources/views/livewire/settings-email.blade.php
+++ b/resources/views/livewire/settings-email.blade.php
@@ -1,19 +1,21 @@
 <div>
     <x-slot:title>
-        Settings | Coolify
+        Transactional Email | Coolify
     </x-slot>
     <x-settings.navbar />
-    <div class="flex items-center gap-2">
-        <h2>Transactional Email</h2>
-    </div>
-    <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
-    <form wire:submit='submitFromFields' class="flex flex-col gap-2 pb-4">
-        <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" />
-        <x-forms.button type="submit">
-            Save
-        </x-forms.button>
+    <form wire:submit='submit' class="flex flex-col gap-2 pb-4">
+        <div class="flex items-center gap-2">
+            <h2>Transactional Email</h2>
+            <x-forms.button type="submit">
+                Save
+            </x-forms.button>
+        </div>
+        <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
+        <div class="flex  gap-4">
+            <x-forms.input required id="smtpFromName" helper="Name used in emails." label="From Name" />
+            <x-forms.input required id="smtpFromAddress" helper="Email address used in emails." label="From Address" />
+        </div>
+
     </form>
     <div class="flex flex-col gap-4">
         <div class="p-4 border dark:border-coolgray-300">
@@ -25,27 +27,26 @@
                     </x-forms.button>
                 </div>
                 <div class="w-32">
-                    <x-forms.checkbox instantSave id="settings.smtp_enabled" label="Enabled" />
+                    <x-forms.checkbox instantSave='instantSave("SMTP")' id="smtpEnabled" label="Enabled" />
                 </div>
                 <div class="flex flex-col gap-4">
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input required id="settings.smtp_host" placeholder="smtp.mailgun.org" label="Host" />
-                        <x-forms.input required id="settings.smtp_port" placeholder="587" label="Port" />
-                        <x-forms.input id="settings.smtp_encryption" helper="If SMTP uses SSL, set it to 'tls'."
-                            placeholder="tls" label="Encryption" />
+                        <x-forms.input required id="smtpHost" placeholder="smtp.mailgun.org" label="Host" />
+                        <x-forms.input required id="smtpPort" placeholder="587" label="Port" />
+                        <x-forms.input id="smtpEncryption" helper="If SMTP uses 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" label="SMTP Username" />
-                        <x-forms.input id="settings.smtp_password" type="password" label="SMTP Password"
+                        <x-forms.input id="smtpUsername" label="SMTP Username" />
+                        <x-forms.input id="smtpPassword" type="password" label="SMTP Password"
                             autocomplete="new-password" />
-                        <x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails."
-                            label="Timeout" />
+                        <x-forms.input id="smtpTimeout" helper="Timeout value for sending emails." label="Timeout" />
                     </div>
                 </div>
             </form>
         </div>
         <div class="p-4 border dark:border-coolgray-300">
-            <form wire:submit='submitResend' class="flex flex-col">
+            <form wire:submit='submit' class="flex flex-col">
                 <div class="flex gap-2">
                     <h3>Resend</h3>
                     <x-forms.button type="submit">
@@ -53,12 +54,12 @@
                     </x-forms.button>
                 </div>
                 <div class="w-32">
-                    <x-forms.checkbox instantSave='instantSaveResend' id="settings.resend_enabled" label="Enabled" />
+                    <x-forms.checkbox instantSave='instantSave("Resend")' id="resendEnabled" label="Enabled" />
                 </div>
                 <div class="flex flex-col gap-4">
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input type="password" id="settings.resend_api_key" placeholder="API key" required
-                            label="Host" autocomplete="new-password" />
+                        <x-forms.input type="password" id="resendApiKey" placeholder="API key" required label="API Key"
+                            autocomplete="new-password" />
                     </div>
                 </div>
             </form>