diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/properties/MailConfig.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/properties/MailConfig.java
index acbef8c..d3fba73 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/properties/MailConfig.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/properties/MailConfig.java
@@ -10,6 +10,7 @@ public class MailConfig {
     private String from;
     private String username;
     private String password;
+    private String sslProtocols;
 
     public void setHost(String host) {
         this.host = host;
@@ -35,6 +36,10 @@ public class MailConfig {
         this.password = password;
     }
 
+    public void setSslProtocols(String sslProtocols) {
+        this.sslProtocols = sslProtocols;
+    }
+
     public String getHost() {
         return host;
     }
@@ -58,4 +63,8 @@ public class MailConfig {
     public String getPassword() {
         return password;
     }
+
+    public String getSslProtocols() {
+        return sslProtocols;
+    }
 }
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
index 1470fc9..aab3f97 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
@@ -40,6 +40,7 @@ public class AdminToolsLibraryCheckDeployController {
     public Map<String, String> checkEverything() {
         Map<String, String> response = new HashMap<>();
         response.put("admintoolslibrary.mail.auth",mailConfig.getAuth());
+        response.put("admintoolslibrary.mail.sslProtocols",mailConfig.getSslProtocols());
         response.put("admintoolslibrary.mail.from", mailConfig.getFrom());
         response.put("admintoolslibrary.mail.host", mailConfig.getHost());
         response.put("admintoolslibrary.mail.port", mailConfig.getPort());
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
index 6e46e35..65270ab 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
@@ -30,8 +30,8 @@ public class EmailSender {
         properties.put("mail.smtp.port", mailConfig.getPort());
         properties.put("mail.smtp.auth", mailConfig.getAuth()); //enable authentication
         properties.put("mail.smtp.starttls.enable", "true");
-        if(mailConfig.getHost().equals("smtp.gmail.com")) {
-            properties.put("mail.smtp.ssl.protocols", "TLSv1.2");
+        if(mailConfig.getSslProtocols() != null) {
+            properties.put("mail.smtp.ssl.protocols", mailConfig.getSslProtocols());
         }
         logger.debug("Try to connect to mail sender with "+ mailConfig.getUsername());
         Session session = Session.getInstance(properties,