diff --git a/client/pages/config/email.vue b/client/pages/config/email.vue
index 4ba7c2223..d85824fe6 100644
--- a/client/pages/config/email.vue
+++ b/client/pages/config/email.vue
@@ -40,7 +40,8 @@
         </div>
 
         <div class="flex items-center justify-between pt-4">
-          <ui-btn :loading="sendingTest" :disabled="savingSettings || !newSettings.host" type="button" @click="sendTestClick">{{ $strings.ButtonTest }}</ui-btn>
+          <ui-btn v-if="hasUpdates" :disabled="savingSettings" type="button" @click="resetChanges">{{ $strings.ButtonReset }}</ui-btn>
+          <ui-btn v-else :loading="sendingTest" :disabled="savingSettings || !newSettings.host" type="button" @click="sendTestClick">{{ $strings.ButtonTest }}</ui-btn>
           <ui-btn :loading="savingSettings" :disabled="!hasUpdates" type="submit">{{ $strings.ButtonSave }}</ui-btn>
         </div>
       </form>
@@ -121,6 +122,11 @@ export default {
     }
   },
   methods: {
+    resetChanges() {
+      this.newSettings = {
+        ...this.settings
+      }
+    },
     editDeviceClick(device) {
       this.selectedEReaderDevice = device
       this.showEReaderDeviceModal = true
diff --git a/client/strings/de.json b/client/strings/de.json
index 12d221412..f73b7edab 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Eingebettetes Cover",
   "LabelEnable": "Aktivieren",
   "LabelEnd": "Ende",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index ff68844f1..28e98e521 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Enable",
   "LabelEnd": "End",
diff --git a/client/strings/es.json b/client/strings/es.json
index 4dead10fe..c7241cd03 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Portada Integrada",
   "LabelEnable": "Habilitar",
   "LabelEnd": "Fin",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index adbda470b..c8f2f6473 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Couverture du livre intégrée",
   "LabelEnable": "Activer",
   "LabelEnd": "Fin",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index e02091e4d..bf5f71943 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Enable",
   "LabelEnd": "End",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index 0ea40610f..194dae298 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Enable",
   "LabelEnd": "End",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index d23dd7fd5..d8210aea8 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Uključi",
   "LabelEnd": "Kraj",
diff --git a/client/strings/it.json b/client/strings/it.json
index 147166c4e..5c65773f1 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Abilita",
   "LabelEnd": "Fine",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index 88217ca63..4c56958d3 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Ingesloten cover",
   "LabelEnable": "Inschakelen",
   "LabelEnd": "Einde",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 37ca59137..49fa91672 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Włącz",
   "LabelEnd": "Zakończ",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index a7a717002..0d468c8d2 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "Embedded Cover",
   "LabelEnable": "Включить",
   "LabelEnd": "Конец",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 35ede28cb..aefcc5072 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -228,9 +228,9 @@
   "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)",
+  "LabelEmailSettingsTestAddress": "Test Address",
   "LabelEmbeddedCover": "嵌入封面",
   "LabelEnable": "启用",
   "LabelEnd": "结束",
diff --git a/server/managers/EmailManager.js b/server/managers/EmailManager.js
index 0c9236f89..cf0e4b9cc 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.testAddress,
+      to: this.db.emailSettings.testAddress || this.db.emailSettings.fromAddress,
       subject: 'Test email from Audiobookshelf',
       text: 'Success!'
     }).then((result) => {