diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 88440c09..1a966820 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -186,7 +186,7 @@
 #define	TIMEOUT_MIN					(5 * 1000)	// Minimum timeout in seconds
 #define	TIMEOUT_MAX					(60 * 1000)	// Maximum timeout in seconds
 #define	TIMEOUT_DEFAULT				(30 * 1000) // Default number of seconds to timeout
-#define	CONNECTING_TIMEOUT			(15 * 1000)	// Timeout in seconds of being connected
+#define	CONNECTING_TIMEOUT			(120 * 1000)	// Timeout in seconds of being connected, make it 2FA friendly
 #define	CONNECTING_POOLING_SPAN		(3 * 1000) // Polling interval of connected
 #define	MIN_RETRY_INTERVAL			(5 * 1000)		// Minimum retry interval
 #define	MAX_RETRY_INTERVAL			(300 * 1000)	// Maximum retry interval
diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h
index 8c422368..049c54a7 100644
--- a/src/Cedar/Radius.h
+++ b/src/Cedar/Radius.h
@@ -14,7 +14,7 @@
 
 #define	RADIUS_DEFAULT_PORT		1812			// The default port number
 #define	RADIUS_RETRY_INTERVAL	1000				// Retransmission interval
-#define	RADIUS_RETRY_TIMEOUT	(15 * 1000)		// Time-out period, keep it 2FA friendly
+#define	RADIUS_RETRY_TIMEOUT	(120 * 1000)		// Time-out period, make it 2FA friendly
 #define	RADIUS_INITIAL_EAP_TIMEOUT	1600		// Initial timeout for EAP
 
 
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index 74c53554..4af23345 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -33,7 +33,7 @@ struct DYN_VALUE
 
 #define	TIMEOUT_INFINITE			(0x7fffffff)
 #define	TIMEOUT_TCP_PORT_CHECK		(10 * 1000)
-#define	TIMEOUT_SSL_CONNECT			(15 * 1000)
+#define	TIMEOUT_SSL_CONNECT			(120 * 1000) //make it 2FA friendly
 
 #define	TIMEOUT_NETBIOS_HOSTNAME	(100)
 
@@ -821,7 +821,7 @@ struct CONNECT_TCP_RUDP_PARAM
 	bool Tcp_InNegotiation;
 };
 
-#define	SSL_DEFAULT_CONNECT_TIMEOUT		(15 * 1000)		// SSL default timeout
+#define	SSL_DEFAULT_CONNECT_TIMEOUT		(120 * 1000)		// SSL default timeout, make it 2FA friendly
 
 // Header for TCP Pair
 struct TCP_PAIR_HEADER