diff --git a/client/components/admin/admin-mail.vue b/client/components/admin/admin-mail.vue
index 660660f9..49b46789 100644
--- a/client/components/admin/admin-mail.vue
+++ b/client/components/admin/admin-mail.vue
@@ -57,6 +57,16 @@
                       :hint='$t(`admin:mail.smtpPortHint`)'
                       style='max-width: 300px;'
                       )
+                    v-text-field(
+                      outlined
+                      v-model='config.name'
+                      :label='$t(`admin:mail.smtpName`)'
+                      required
+                      :counter='255'
+                      prepend-icon='mdi-server'
+                      persistent-hint
+                      :hint='$t(`admin:mail.smtpNameHint`)'
+                      )
                     v-switch(
                       v-model='config.secure'
                       :label='$t(`admin:mail.smtpTLS`)'
@@ -169,6 +179,7 @@ export default {
         senderEmail: '',
         host: '',
         port: 0,
+        name: '',
         secure: false,
         verifySSL: false,
         user: '',
@@ -192,6 +203,7 @@ export default {
             senderEmail: this.config.senderEmail || '',
             host: this.config.host || '',
             port: _.toSafeInteger(this.config.port) || 0,
+            namer: this.config.name || '',
             secure: this.config.secure || false,
             verifySSL: this.config.verifySSL || false,
             user: this.config.user || '',
diff --git a/client/graph/admin/mail/mail-mutation-save-config.gql b/client/graph/admin/mail/mail-mutation-save-config.gql
index 3b8f6999..6b49ad2e 100644
--- a/client/graph/admin/mail/mail-mutation-save-config.gql
+++ b/client/graph/admin/mail/mail-mutation-save-config.gql
@@ -18,6 +18,7 @@ mutation (
       senderEmail: $senderEmail,
       host: $host,
       port: $port,
+      name: $name,
       secure: $secure,
       verifySSL: $verifySSL,
       user: $user,
diff --git a/client/graph/admin/mail/mail-query-config.gql b/client/graph/admin/mail/mail-query-config.gql
index 66232acb..5d7091aa 100644
--- a/client/graph/admin/mail/mail-query-config.gql
+++ b/client/graph/admin/mail/mail-query-config.gql
@@ -5,6 +5,7 @@
       senderEmail
       host
       port
+      name
       secure
       verifySSL
       user
diff --git a/server/core/mail.js b/server/core/mail.js
index 9dad973a..4af28b65 100644
--- a/server/core/mail.js
+++ b/server/core/mail.js
@@ -13,6 +13,7 @@ module.exports = {
       let conf = {
         host: WIKI.config.mail.host,
         port: WIKI.config.mail.port,
+        name: WIKI.config.mail.name,
         secure: WIKI.config.mail.secure,
         tls: {
           rejectUnauthorized: !(WIKI.config.mail.verifySSL === false)
diff --git a/server/graph/resolvers/mail.js b/server/graph/resolvers/mail.js
index d7e87397..7305e686 100644
--- a/server/graph/resolvers/mail.js
+++ b/server/graph/resolvers/mail.js
@@ -49,6 +49,7 @@ module.exports = {
           senderEmail: args.senderEmail,
           host: args.host,
           port: args.port,
+          name: args.name,
           secure: args.secure,
           verifySSL: args.verifySSL,
           user: args.user,
diff --git a/server/graph/schemas/mail.graphql b/server/graph/schemas/mail.graphql
index f935c5ac..d9741d82 100644
--- a/server/graph/schemas/mail.graphql
+++ b/server/graph/schemas/mail.graphql
@@ -32,6 +32,7 @@ type MailMutation {
     senderEmail: String!
     host: String!
     port: Int!
+    name: String!
     secure: Boolean!
     verifySSL: Boolean!
     user: String!
@@ -52,6 +53,7 @@ type MailConfig {
   senderEmail: String!
   host: String!
   port: Int!
+  name: String!
   secure: Boolean!
   verifySSL: Boolean!
   user: String!
diff --git a/server/setup.js b/server/setup.js
index 6d87a29f..44da308b 100644
--- a/server/setup.js
+++ b/server/setup.js
@@ -103,6 +103,7 @@ module.exports = () => {
         senderEmail: '',
         host: '',
         port: 465,
+        name: '',
         secure: true,
         verifySSL: true,
         user: '',