diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 1121fb12..e9530099 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -678,6 +678,7 @@ export default {
     username: 'Username',
     next: 'Next',
     continue: 'Continue',
+    skip: 'Skip',
     database: {
       database: 'Site URL & Database',
       connection: 'Database Connection',
diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue
index 7be0d0f1..1a137dcf 100644
--- a/resources/assets/js/views/estimates/Item.vue
+++ b/resources/assets/js/views/estimates/Item.vue
@@ -313,7 +313,11 @@ export default {
   },
   created () {
     window.hub.$on('checkItems', this.validateItem)
-    window.hub.$on('newItem', this.onSelectItem)
+    window.hub.$on('newItem', (val) => {
+      if (this.item.item_id) {
+        this.onSelectItem(val)
+      }
+    })
   },
   methods: {
     updateTax (data) {
diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue
index 83e00997..c1ef3b0b 100644
--- a/resources/assets/js/views/invoices/Item.vue
+++ b/resources/assets/js/views/invoices/Item.vue
@@ -314,7 +314,11 @@ export default {
   },
   created () {
     window.hub.$on('checkItems', this.validateItem)
-    window.hub.$on('newItem', this.onSelectItem)
+    window.hub.$on('newItem', (val) => {
+      if (this.item.item_id) {
+        this.onSelectItem(val)
+      }
+    })
   },
   methods: {
     updateTax (data) {
diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index ba384107..f90c6a04 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -109,15 +109,26 @@
           </div>
         </div>
       </div>
-      <base-button
-        :loading="loading"
-        class="pull-right mt-5"
-        icon="save"
-        color="theme"
-        type="submit"
-      >
-        {{ $t('wizard.save_cont') }}
-      </base-button>
+      <div class="row mt-5">
+        <base-button
+          :loading="loading"
+          class="pull-right"
+          icon="save"
+          color="theme"
+          type="submit"
+        >
+          {{ $t('wizard.save_cont') }}
+        </base-button>
+        <base-button
+          :loading="loading"
+          class="pull-right ml-4"
+          outline
+          color="theme"
+          @click="$emit('next')"
+        >
+          {{ $t('wizard.skip') }}
+        </base-button>
+      </div>
     </form>
   </div>
 </template>
@@ -137,10 +148,10 @@ export default {
       mailConfigData: {
         mail_driver: 'smtp',
         mail_host: 'mailtrap.io',
-        mail_port: 2525,
-        mail_username: 'cc3c64516febd4',
-        mail_password: 'e6a0176301f587',
-        mail_encryption: 'tls'
+        mail_port: null,
+        mail_username: null,
+        mail_password: null,
+        mail_encryption: null
       },
       loading: false,
       mail_drivers: []