diff --git a/galette/lib/Galette/Core/GaletteMail.php b/galette/lib/Galette/Core/GaletteMail.php
index aade92b3..fdf193c4 100644
--- a/galette/lib/Galette/Core/GaletteMail.php
+++ b/galette/lib/Galette/Core/GaletteMail.php
@@ -163,6 +163,13 @@ class GaletteMail
                         );
                         $this->mail->Port = 25;
                     }
+
+                    if($this->mail->Port == 465)
+                        $this->mail->SMTPSecure = "ssl";
+
+                    if($this->mail->Port == 587)
+                        $this->mail->SMTPSecure = "tls";
+
                 }
 
                 // SMTP account username