diff --git a/ceod/model/MailService.py b/ceod/model/MailService.py
index ecb1e6ace..eba191819 100644
--- a/ceod/model/MailService.py
+++ b/ceod/model/MailService.py
@@ -44,9 +44,9 @@ class MailService:
             client = smtplib.SMTP_SSL(self.host, self.port)
         else:
             client = smtplib.SMTP(self.host, self.port)
-        client.ehlo()
         if self.starttls:
             client.starttls()
+        client.ehlo()
         client.send_message(msg)
         client.quit()