diff --git a/apps/common/src/python/mediawords/util/config/common.py b/apps/common/src/python/mediawords/util/config/common.py
index c0f117393c..e85098f5b6 100644
--- a/apps/common/src/python/mediawords/util/config/common.py
+++ b/apps/common/src/python/mediawords/util/config/common.py
@@ -274,13 +274,11 @@ def port() -> int:
     @staticmethod
     def use_starttls() -> bool:
         """Use STARTTLS? If you enable that, you probably want to change the port to 587."""
-        # FIXME remove altogether, not used
         return False
 
     @staticmethod
     def username() -> str:
         """Username."""
-        # FIXME remove, not used
         return ''
 
     @staticmethod
diff --git a/apps/common/src/python/mediawords/util/mail.py b/apps/common/src/python/mediawords/util/mail.py
index 9bea5ec1ed..f463896cf1 100644
--- a/apps/common/src/python/mediawords/util/mail.py
+++ b/apps/common/src/python/mediawords/util/mail.py
@@ -134,11 +134,22 @@ def send_email(message: Message) -> bool:
 
         else:
 
-            # Connect to SMTP
-            smtp = smtplib.SMTP(
-                host=CommonConfig.smtp().hostname(),
-                port=CommonConfig.smtp().port(),
-            )
+            # Connect to SMTP_SSL
+            if CommonConfig.smtp().use_starttls():
+                smtp = smtplib.SMTP_SSL(
+                    host=CommonConfig.smtp().hostname(),
+                    port=CommonConfig.smtp().port(),
+                )
+                smtp.login(
+                    user=CommonConfig.smtp().username(),
+                    password=CommonConfig.smtp().password(),
+                )
+            else:
+                # Connect to SMTP
+                smtp = smtplib.SMTP(
+                    host=CommonConfig.smtp().hostname(),
+                    port=CommonConfig.smtp().port(),
+                )
 
             # Send message
             refused_recipients = smtp.sendmail(mime_message['From'], mime_message['To'], mime_message.as_string())