diff --git a/web/Modules/Email/App/Console/SetupEmailServer.php b/web/Modules/Email/App/Console/SetupEmailServer.php
index dce4937f..e1e53be5 100644
--- a/web/Modules/Email/App/Console/SetupEmailServer.php
+++ b/web/Modules/Email/App/Console/SetupEmailServer.php
@@ -8,6 +8,7 @@
 use App\UniversalDatabaseExecutor;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Blade;
+use Modules\Email\App\Models\DomainDkim;
 use Modules\LetsEncrypt\Models\LetsEncryptCertificate;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/web/Modules/Email/App/Http/Livewire/DkimSetup.php b/web/Modules/Email/App/Http/Livewire/DkimSetup.php
index e27c27e1..2814f056 100644
--- a/web/Modules/Email/App/Http/Livewire/DkimSetup.php
+++ b/web/Modules/Email/App/Http/Livewire/DkimSetup.php
@@ -3,6 +3,7 @@
 namespace Modules\Email\App\Http\Livewire;
 
 use Livewire\Component;
+use Modules\Email\App\Models\DomainDkim;
 use Modules\Email\DkimDomainSetup;
 
 class DkimSetup extends Component
@@ -80,6 +81,16 @@ public function verify()
     public function secure()
     {
         $output = DkimDomainSetup::run($this->domain);
+        if (isset($output['privateKey'])) {
+            $findDomainDkim = DomainDkim::where('domain_name', $this->domain)->first();
+            if (!$findDomainDkim) {
+                $findDomainDkim = new DomainDkim();
+                $findDomainDkim->domain_name = $this->domain;
+            }
+            $findDomainDkim->private_key = $output['privateKey'];
+            $findDomainDkim->public_key = $output['text'];
+            $findDomainDkim->save();
+        }
 
         return $output;
     }