diff --git a/src/main/java/foundation/privacybydesign/email/EmailSender.java b/src/main/java/foundation/privacybydesign/email/EmailSender.java
index 42e9e73..5b27af7 100644
--- a/src/main/java/foundation/privacybydesign/email/EmailSender.java
+++ b/src/main/java/foundation/privacybydesign/email/EmailSender.java
@@ -41,6 +41,8 @@ public static void send(String toAddresses, String subject, String body, String
         Session session;
         if (EmailConfiguration.getInstance().getMailUser().length() > 0) {
             props.put("mail.smtp.auth", "true");
+            props.put("mail.smtp.ssl.checkserveridentity", "true");
+            
             session = Session.getInstance(props, new Authenticator() {
                 @Override
                 protected PasswordAuthentication getPasswordAuthentication() {