diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
index a8406bfd457..f5668603045 100644
--- a/ckan/config/middleware/flask_app.py
+++ b/ckan/config/middleware/flask_app.py
@@ -474,11 +474,17 @@ def filter(self, log_record):
             return True
 
     mailhost = tuple(config.get('smtp.server', 'localhost').split(":"))
+    credentials = None
+    if config.get('smtp.user'):
+        credentials = (config.get('smtp.user'), config.get('smtp.password'))
+    secure = () if asbool(config.get('smtp.starttls')) else None
     mail_handler = SMTPHandler(
         mailhost=mailhost,
         fromaddr=config.get('error_email_from'),
         toaddrs=[config.get('email_to')],
-        subject='Application Error'
+        subject='Application Error',
+        credentials=credentials,
+        secure=secure
     )
 
     mail_handler.setFormatter(logging.Formatter('''