diff --git a/.env.example b/.env.example
index 330a9e3f..09d89cf1 100644
--- a/.env.example
+++ b/.env.example
@@ -27,6 +27,9 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=
 
+MAIL_FROM_ADDRESS=
+MAIL_FROM_NAME=
+
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index 456a0e0f..dc2c487a 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -33,20 +33,20 @@ class EnvironmentManager
     public function saveDatabaseVariables(DatabaseEnvironmentRequest $request)
     {
         $oldDatabaseData =
-        'DB_CONNECTION='.config('database.default')."\n".
-        'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
-        'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
-        'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
-        'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
-        'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
+            'DB_CONNECTION='.config('database.default')."\n".
+            'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
+            'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
+            'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
+            'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
+            'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
 
         $newDatabaseData =
-        'DB_CONNECTION='.$request->database_connection."\n".
-        'DB_HOST='.$request->database_hostname."\n".
-        'DB_PORT='.$request->database_port."\n".
-        'DB_DATABASE='.$request->database_name."\n".
-        'DB_USERNAME='.$request->database_username."\n".
-        'DB_PASSWORD='.$request->database_password."\n\n";
+            'DB_CONNECTION='.$request->database_connection."\n".
+            'DB_HOST='.$request->database_hostname."\n".
+            'DB_PORT='.$request->database_port."\n".
+            'DB_DATABASE='.$request->database_name."\n".
+            'DB_USERNAME='.$request->database_username."\n".
+            'DB_PASSWORD='.$request->database_password."\n\n";
 
         if (! $this->checkDatabaseConnection($request)) {
 
@@ -97,6 +97,8 @@ class EnvironmentManager
 
         $mailData = $this->getMailData($request);
         dd($mailData);
+//         extra_mail_data
+// extra_old_mail_data
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -118,40 +120,68 @@ class EnvironmentManager
 
     private function getMailData($request)
     {
-        $mailCredential = "";
-        $otherCredential = "";
-        $oldMailOtherCredential = "";
+        $mailFromCredential = "";
+        $extraMailData = "";
+        $extraOldMailData = "";
+        $oldMailData = "";
+        $newMailData = "";
 
         if(env('MAIL_FROM_ADDRESS') && env('MAIL_FROM_NAME')) {
-            $oldMailOtherCredential =
+            $mailFromCredential =
                 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
                 'MAIL_FROM_NAME='.config('mail.from.name')."\n\n";
         }
 
-        $oldMailCredential =
-            'MAIL_USERNAME='.config('mail.username')."\n".
-            'MAIL_PASSWORD='.config('mail.password')."\n";
-
-        $resetCredential =
-            'MAIL_USERNAME='."\n".
-            'MAIL_PASSWORD='."\n";
-
         switch ($request->mail_driver) {
             case 'smtp':
-                $mailCredential=
+
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+        
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.$request->mail_username."\n".
                     'MAIL_PASSWORD='.$request->mail_password."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'mailgun':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+        
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
                     'MAILGUN_SECRET='.$request->mail_mailgun_secret."\n".
                     'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n\n";
 
                 if(env('MAILGUN_DOMAIN') && env('MAILGUN_SECRET') && env('MAILGUN_ENDPOINT')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'MAILGUN_DOMAIN='.config('services.mailgun.domain')."\n".
                         'MAILGUN_SECRET='.config('services.mailgun.secret')."\n".
                         'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n\n";
@@ -160,84 +190,142 @@ class EnvironmentManager
                 break;
 
             case 'sparkpost':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n\n";
 
-                if(env('SPARKPOST_SECRET')) {
-                    $oldMailOtherCredential =
-                        'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
-                }
+                    if(env('SPARKPOST_SECRET')) {
+                        $extraOldMailData =
+                            'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
+                    }
                 break;
 
             case 'ses':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'SES_KEY='.$request->mail_ses_key."\n".
                     'SES_SECRET='.$request->mail_ses_secret."\n\n";
 
                 if(env('SES_KEY') && env('SES_SECRET')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'SES_KEY='.config('services.ses.key')."\n".
                         'SES_SECRET='.config('services.ses.secret')."\n\n";
                 }
                 break;
 
             case 'mail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
-                    $otherCredential;
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'sendmail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
-                    $otherCredential;
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'mandrill':
-                $mailCredential = $oldMailCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n\n";
 
                 if(env('MANDRILL_API_KEY')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n\n";
                 }
                 break;
         }
 
-        $oldMailData =
-            'MAIL_DRIVER='.config('mail.driver')."\n".
-            'MAIL_HOST='.config('mail.host')."\n".
-            'MAIL_PORT='.config('mail.port')."\n".
-            $oldMailCredential.
-            'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
-            $oldMailOtherCredential;
-
-        $newMailData = $existMailData ??
-            'MAIL_DRIVER='.$request->mail_driver."\n".
-            'MAIL_HOST='.$request->mail_host."\n".
-            'MAIL_PORT='.$request->mail_port."\n".
-            $mailCredential.
-            'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
-            'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-            'MAIL_FROM_NAME='.$request->from_name."\n\n".
-            $otherCredential;
-
         return [
             'old_mail_data' => $oldMailData,
-            'new_mail_data' => $newMailData
+            'new_mail_data' => $newMailData,
+            'extra_mail_data' => $extraMailData,
+            'extra_old_mail_data' => $extraOldMailData
         ];
     }
 
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index f726b3f9..91e9bfa7 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -569,16 +569,16 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
       sparkpost_secret: 'Sparkpost Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
+      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',
@@ -747,16 +747,16 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
       sparkpost_secret: 'Sparkpost Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
+      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',
diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
index a6fa165c..3e49ffb6 100644
--- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
@@ -112,7 +112,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.domain') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
@@ -128,7 +128,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgin_secret') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_secret.$error"