diff --git a/components/admin/SMTP.vue b/components/admin/SMTP.vue
index 04999835..54584059 100644
--- a/components/admin/SMTP.vue
+++ b/components/admin/SMTP.vue
@@ -3,7 +3,6 @@
     v-card-title SMTP Email configuration
     v-card-text
       p(v-html="$t('admin.smtp_description')")
-
       v-form(v-model='isValid')
         v-text-field(v-model='admin_email'
           @blur="save('admin_email', admin_email )"
@@ -68,7 +67,9 @@ export default {
       }
     },    
     done () {
-      this.setSetting({ key: 'smtp', value: JSON.parse(JSON.stringify(this.smtp)) })
+      if (this.smtp.auth.pass) {
+        this.setSetting({ key: 'smtp', value: JSON.parse(JSON.stringify(this.smtp)) })
+      }
       this.$emit('close')
     },
 
diff --git a/server/helpers.js b/server/helpers.js
index 059475a3..d26cb858 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -66,12 +66,10 @@ module.exports = {
     req.settings = { ...settingsController.settings }
 
     if (req.settings.smtp && req.settings.smtp.auth && req.settings.smtp.auth.pass) {
-      if (req.user && req.user.is_admin) {
-        delete req.settings.smtp.auth.pass
-      } else {
-        delete req.settings.smtp
-      }
+
+      delete req.settings.smtp.auth.pass
     }
+    delete req.settings.publicKey
     req.settings.baseurl = config.baseurl
     req.settings.hostname = config.hostname
     req.settings.title = req.settings.title || config.title