diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index c579471b0..e5f092157 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -134,7 +134,7 @@ bool KSSL::TLSInit() {
 		return false;
 
 	seedWithEGD();
-	d->m_meth = d->kossl->TLSv1_client_method();
+	d->m_meth = d->kossl->TLS_client_method();
 	d->lastInitTLS = true;
 
 	m_pi.reset();
@@ -173,13 +173,15 @@ bool KSSL::initialize() {
 
 	m_pi.reset();
 
-	if (!m_cfg->tlsv1() && !m_cfg->sslv3() && m_cfg->sslv2())
-		d->m_meth = d->kossl->SSLv2_client_method();
-        else if (m_cfg->tlsv1() && !m_cfg->sslv3() && !m_cfg->sslv2())
-		d->m_meth = d->kossl->TLSv1_client_method();
-	else if (!m_cfg->tlsv1() && m_cfg->sslv3() && !m_cfg->sslv2())
+	if (m_cfg->tlsv1() || (m_cfg->sslv3() && m_cfg->sslv2())) {
+		d->m_meth = d->kossl->TLS_client_method();
+	}
+	else if (m_cfg->sslv3()) {
 		d->m_meth = d->kossl->SSLv3_client_method();
-	else d->m_meth = d->kossl->TLS_client_method();
+	}
+	else if (m_cfg->sslv2()) {
+		d->m_meth = d->kossl->SSLv2_client_method();
+	}
 
 /*
 if (m_cfg->sslv2() && m_cfg->sslv3()) kdDebug(7029) << "Double method" << endl;