diff --git a/src/user.cpp b/src/user.cpp
index fff621103c1eaf7ed4b94e6881ef1496556209fa..3d3cb06ddb7cbdec585d3566f9ceb08edb6e2d54 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -58,7 +58,7 @@ User::User(const Swift::JID &jid, UserInfo &userInfo, Component *component, User
 	m_resources = 0;
 	m_reconnectCounter = 0;
 
-	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(10000);
+	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(5000);
 	m_reconnectTimer->onTick.connect(boost::bind(&User::onConnectingTimeout, this)); 
 
 	m_rosterManager = new RosterManager(this, m_component);
@@ -199,6 +199,9 @@ void User::handlePresence(Swift::Presence::ref presence) {
 					m_readyForConnect = true;
 					onReadyToConnect();
 				}
+				else {
+					m_reconnectTimer->start();
+				}
 			}
 			else if (m_component->inServerMode()) {
 				LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");