diff --git a/frontend/src/views/settings/smtp.vue b/frontend/src/views/settings/smtp.vue
index 0ffc02f..08d52b9 100644
--- a/frontend/src/views/settings/smtp.vue
+++ b/frontend/src/views/settings/smtp.vue
@@ -301,6 +301,7 @@ export default Vue.extend({
         this.$utils.toast(this.$t('settings.smtp.testEnterEmail'), 'is-danger');
         this.$nextTick(() => {
           const i = document.querySelector(`.password-${n}`);
+          this.data.smtp[n].password = '';
           i.focus();
           i.select();
         });
@@ -331,7 +332,7 @@ export default Vue.extend({
       if (!item.host || !item.port) {
         return false;
       }
-      if (item.auth_protocol !== 'none' && !item.password.trim()) {
+      if (item.auth_protocol !== 'none' && item.password.includes('•')) {
         return false;
       }
 
diff --git a/i18n/en.json b/i18n/en.json
index 7019d23..339f1ba 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -508,7 +508,7 @@
     "settings.smtp.sendTest": "Send e-mail",
     "settings.smtp.setCustomHeaders": "Set custom headers",
     "settings.smtp.testConnection": "Test connection",
-    "settings.smtp.testEnterEmail": "Enter password to test",
+    "settings.smtp.testEnterEmail": "Re-enter password to test",
     "settings.smtp.toEmail": "To e-mail",
     "settings.title": "Settings",
     "settings.updateAvailable": "A new update {version} is available.",