diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index bd120703..a8a6419f 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -142,7 +142,7 @@ class EnvironmentManager
         if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) {
             $mailFromCredential =
                 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
-                'MAIL_FROM_NAME='.config('mail.from.name')."\n\n";
+                'MAIL_FROM_NAME="'.config('mail.from.name')."\"\n\n";
         }
 
         switch ($request->mail_driver) {
@@ -165,7 +165,7 @@ class EnvironmentManager
                     '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";
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
 
                 break;
 
@@ -187,7 +187,7 @@ class EnvironmentManager
                     '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";
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
 
                 $extraMailData=
                     'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
@@ -221,7 +221,7 @@ class EnvironmentManager
                     '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";
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
 
                 $extraMailData=
                     'SES_KEY='.$request->mail_ses_key."\n".
@@ -253,7 +253,7 @@ class EnvironmentManager
                     '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";
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
 
                 break;
 
@@ -275,7 +275,7 @@ class EnvironmentManager
                     '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";
+                    'MAIL_FROM_NAME="'.$request->from_name."\"\n\n";
 
                 break;
         }
diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index a273ace5..555810a8 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -35,9 +35,9 @@ export default {
   data () {
     return {
       mailConfigData: {
-        mail_driver: 'smtp'
+        mail_driver: 'mail'
       },
-      mail_driver: 'smtp',
+      mail_driver: 'mail',
       loading: false,
       mail_drivers: []
     }
diff --git a/resources/assets/js/views/wizard/Settings.vue b/resources/assets/js/views/wizard/Settings.vue
index faeb8fe2..dbefcd67 100644
--- a/resources/assets/js/views/wizard/Settings.vue
+++ b/resources/assets/js/views/wizard/Settings.vue
@@ -101,6 +101,7 @@
 import MultiSelect from 'vue-multiselect'
 import { validationMixin } from 'vuelidate'
 import Ls from '../../services/ls'
+import { mapActions } from 'vuex'
 const { required, minLength, email } = require('vuelidate/lib/validators')
 
 export default {
@@ -149,6 +150,9 @@ export default {
     this.getOnboardingData()
   },
   methods: {
+    ...mapActions('auth', [
+      'loginOnBoardingUser'
+    ]),
     async getOnboardingData () {
       let response = await window.axios.get('/api/admin/onboarding')
       if (response.data) {
@@ -201,6 +205,7 @@ export default {
         // this.$emit('next')
         this.loading = false
         Ls.set('auth.token', response.data.token)
+        this.loginOnBoardingUser(response.data.token)
         this.$router.push('/admin/dashboard')
       }
     }