diff --git a/components/admin/SMTP.vue b/components/admin/SMTP.vue
index 8bccd115..9f00774b 100644
--- a/components/admin/SMTP.vue
+++ b/components/admin/SMTP.vue
@@ -6,6 +6,7 @@
 
       v-form(v-model='isValid')
         v-text-field(v-model='admin_email'
+          @blur="save('admin_email', admin_email )"
           :label="$t('admin.admin_email')"
           :rules="$validators.email")
 
@@ -31,27 +32,21 @@
 <script>
 import { mapActions, mapState } from 'vuex'
 export default {
-  data () {
+  data ({ $store }) {
+    const smtp = { host: '', auth: { user: '', pass: '' } }
+    if ($store.state.settings.smtp && $store.state.settings.smtp.auth) {
+      smtp.host = $store.state.settings.smtp.host
+      smtp.auth.user = $store.state.settings.smtp.auth.user
+      smtp.auth.pass = $store.state.settings.smtp.auth.pass
+    }
     return {
       isValid: false,
       loading: false,
-      smtp: { host: '', auth: {} }
-    }
-  },
-  computed: {
-    ...mapState(['settings']),
-    admin_email: {
-      get () { return this.settings.admin_email },
-      set (value) { this.setSetting({ key: 'admin_email', value }) }
-    },
-  },
-  mounted () {
-    if (this.settings.smtp && this.settings.smtp.auth) {
-      this.smtp.auth.user = this.settings.smtp.auth.user
-      this.smtp.auth.pass = this.settings.smtp.auth.pass
-      this.smtp.host = this.settings.smtp.host
+      smtp,
+      admin_email: $store.state.settings.admin_email || ''
     }
   },
+  computed: mapState(['settings']),
   methods: {
     ...mapActions(['setSetting']),
     async testSMTP () {
@@ -65,6 +60,11 @@ export default {
       }
       this.loading = false
     },
+    save (key, value) {
+      if (this.settings[key] !== value) {
+        this.setSetting({ key, value })
+      }
+    },    
     done () {
       this.$emit('close')
       this.setSetting({ key: 'smtp', value: this.smtp })
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index 1df5e6c5..0cbf90a1 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -52,7 +52,7 @@
       SMTP(@close='showSMTP = false')
 
     v-card-actions
-      v-btn(text @click='showSMTP=true') {{$t('admin.show_smtp_setup')}}
+      v-btn(text @click='showSMTP=true') <v-icon>mdi-email</v-icon> {{$t('admin.show_smtp_setup')}}
       v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}}
         v-icon mdi-arrow-right