diff --git a/client/pages/config/email.vue b/client/pages/config/email.vue
index 1b5da829d..4ba7c2223 100644
--- a/client/pages/config/email.vue
+++ b/client/pages/config/email.vue
@@ -34,6 +34,9 @@
           <div class="w-full md:w-1/2 px-1">
             <ui-text-input-with-label ref="fromInput" v-model="newSettings.fromAddress" :disabled="savingSettings" :label="$strings.LabelEmailSettingsFromAddress" />
           </div>
+          <div class="w-full md:w-1/2 px-1">
+            <ui-text-input-with-label ref="testInput" v-model="newSettings.testAddress" :disabled="savingSettings" :label="$strings.LabelEmailSettingsTestAddress" />
+          </div>
         </div>
 
         <div class="flex items-center justify-between pt-4">
@@ -93,6 +96,7 @@ export default {
         secure: true,
         user: null,
         pass: null,
+        testAddress: null,
         fromAddress: null
       },
       newEReaderDevice: {
@@ -196,6 +200,7 @@ export default {
         secure: this.newSettings.secure,
         user: this.newSettings.user,
         pass: this.newSettings.pass,
+        testAddress: this.newSettings.testAddress,
         fromAddress: this.newSettings.fromAddress
       }
       this.savingSettings = true
diff --git a/client/strings/de.json b/client/strings/de.json
index 7f8d78ea0..12d221412 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Bearbeiten",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Eingebettetes Cover",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index fa8d35b60..ff68844f1 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Edit",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/es.json b/client/strings/es.json
index b8ff1e96e..4dead10fe 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Editar",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Portada Integrada",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index 09b381836..adbda470b 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Modifier",
   "LabelEmail": "E-mail",
   "LabelEmailSettingsFromAddress": "Expéditeur",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Sécurisé",
   "LabelEmailSettingsSecureHelp": "Si coché, la connexion utilisera TLS lors de la connexion au serveur. Sinon TLS est utilisé si le serveur prend en charge l'extension STARTTLS. Dans la plupart des cas, cochez si vous vous connectez au port 465. Décochez pour le port 587 ou 25. (source: nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Couverture du livre intégrée",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index b8f63f270..e02091e4d 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Edit",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index 788d15ab7..0ea40610f 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Edit",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 98e2a4345..d23dd7fd5 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Uredi",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/it.json b/client/strings/it.json
index a902960f1..147166c4e 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Modifica",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index e528b8283..88217ca63 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Wijzig",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Ingesloten cover",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 330bf6980..37ca59137 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Edytuj",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index e7646f1d4..a7a717002 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -228,6 +228,7 @@
   "LabelEdit": "Редактировать",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "Embedded Cover",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index a9851af58..35ede28cb 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -228,6 +228,7 @@
   "LabelEdit": "编辑",
   "LabelEmail": "Email",
   "LabelEmailSettingsFromAddress": "From Address",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmailSettingsSecure": "Secure",
   "LabelEmailSettingsSecureHelp": "If true the connection will use TLS when connecting to server. If false then TLS is used if server supports the STARTTLS extension. In most cases set this value to true if you are connecting to port 465. For port 587 or 25 keep it false. (from nodemailer.com/smtp/#authentication)",
   "LabelEmbeddedCover": "嵌入封面",
diff --git a/server/managers/EmailManager.js b/server/managers/EmailManager.js
index 3c26d2493..0c9236f89 100644
--- a/server/managers/EmailManager.js
+++ b/server/managers/EmailManager.js
@@ -26,7 +26,7 @@ class EmailManager {
 
     transporter.sendMail({
       from: this.db.emailSettings.fromAddress,
-      to: this.db.emailSettings.fromAddress,
+      to: this.db.emailSettings.testAddress,
       subject: 'Test email from Audiobookshelf',
       text: 'Success!'
     }).then((result) => {
@@ -54,6 +54,7 @@ class EmailManager {
     transporter.sendMail({
       from: this.db.emailSettings.fromAddress,
       to: device.email,
+      subject: "Here is your Ebook!",
       html: '<div dir="auto"></div>',
       attachments: [
         {
diff --git a/server/objects/settings/EmailSettings.js b/server/objects/settings/EmailSettings.js
index 31dcc886d..40648887b 100644
--- a/server/objects/settings/EmailSettings.js
+++ b/server/objects/settings/EmailSettings.js
@@ -10,6 +10,7 @@ class EmailSettings {
     this.secure = true
     this.user = null
     this.pass = null
+    this.testAddress = null
     this.fromAddress = null
 
     // Array of { name:String, email:String }
@@ -26,6 +27,7 @@ class EmailSettings {
     this.secure = !!settings.secure
     this.user = settings.user
     this.pass = settings.pass
+    this.testAddress = settings.testAddress
     this.fromAddress = settings.fromAddress
     this.ereaderDevices = settings.ereaderDevices?.map(d => ({ ...d })) || []
   }
@@ -38,6 +40,7 @@ class EmailSettings {
       secure: this.secure,
       user: this.user,
       pass: this.pass,
+      testAddress: this.testAddress,
       fromAddress: this.fromAddress,
       ereaderDevices: this.ereaderDevices.map(d => ({ ...d }))
     }