diff --git a/app/modules/core/routes/api/admin_settings.py b/app/modules/core/routes/api/admin_settings.py
index 6c965b67..b217a510 100644
--- a/app/modules/core/routes/api/admin_settings.py
+++ b/app/modules/core/routes/api/admin_settings.py
@@ -422,6 +422,8 @@ class EmailStatusResponse(BaseModel):
     smtp_host: str | None = None
     smtp_port: int | None = None
     smtp_user: str | None = None
+    smtp_use_tls: bool | None = None
+    smtp_use_ssl: bool | None = None
     mailgun_domain: str | None = None
     aws_region: str | None = None
     debug: bool
@@ -507,6 +509,8 @@ def get_email_status(
         smtp_host=config["smtp_host"] if provider == "smtp" else None,
         smtp_port=config["smtp_port"] if provider == "smtp" else None,
         smtp_user=config["smtp_user"] if provider == "smtp" else None,
+        smtp_use_tls=config["smtp_use_tls"] if provider == "smtp" else None,
+        smtp_use_ssl=config["smtp_use_ssl"] if provider == "smtp" else None,
         mailgun_domain=config["mailgun_domain"] if provider == "mailgun" else None,
         aws_region=config["aws_region"] if provider == "ses" else None,
         debug=config["debug"],
diff --git a/app/modules/core/static/admin/js/settings.js b/app/modules/core/static/admin/js/settings.js
index 8739fad2..594d34eb 100644
--- a/app/modules/core/static/admin/js/settings.js
+++ b/app/modules/core/static/admin/js/settings.js
@@ -356,8 +356,8 @@ function adminSettings() {
                 smtp_port: this.emailSettings.smtp_port || 587,
                 smtp_user: this.emailSettings.smtp_user || '',
                 smtp_password: '', // Never populated from API
-                smtp_use_tls: true,
-                smtp_use_ssl: false,
+                smtp_use_tls: this.emailSettings.smtp_use_tls ?? true,
+                smtp_use_ssl: this.emailSettings.smtp_use_ssl ?? false,
                 sendgrid_api_key: '',
                 mailgun_api_key: '',
                 mailgun_domain: this.emailSettings.mailgun_domain || '',