diff --git a/include/transport/user.h b/include/transport/user.h
index 840736c846489b57a842f64f94cc419fd20a889f..dcf9a9fe4a03b4b6c3cee0a5a95bc43e32c6fded 100644
--- a/include/transport/user.h
+++ b/include/transport/user.h
@@ -93,11 +93,9 @@ class User {
 			return m_readyForConnect;
 		}
 
-		void setConnected(bool connected) {
-			m_connected = connected;
-			setIgnoreDisconnect(false);
-			updateLastActivity();
-		}
+		void setConnected(bool connected);
+
+		void sendCurrentPresence();
 
 		void setIgnoreDisconnect(bool ignoreDisconnect);
 
diff --git a/src/user.cpp b/src/user.cpp
index 789d25e54b4d0691b21c0fc806ef3a16520355a1..ff6a40cb5d781ab31706949e52f9c52f0c7edb40 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -101,6 +101,49 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
 	return jid;
 }
 
+void User::sendCurrentPresence() {
+	if (m_component->inServerMode()) {
+		return;
+	}
+
+	if (m_connected) {
+		Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
+		if (highest) {
+			Swift::Presence::ref response = Swift::Presence::create(highest);
+			response->setTo(m_jid);
+			response->setFrom(m_component->getJID());
+			m_component->getStanzaChannel()->sendPresence(response);
+			LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << response->getType());
+			onPresenceChanged(highest);
+		}
+		else {
+			Swift::Presence::ref response = Swift::Presence::create();
+			response->setTo(m_jid.toBare());
+			response->setFrom(m_component->getJID());
+			response->setType(Swift::Presence::Unavailable);
+			m_component->getStanzaChannel()->sendPresence(response);
+			onPresenceChanged(response);
+		}
+	}
+	else {
+		Swift::Presence::ref response = Swift::Presence::create();
+		response->setTo(m_jid.toBare());
+		response->setFrom(m_component->getJID());
+		response->setType(Swift::Presence::Unavailable);
+		response->setStatus("Connecting");
+		m_component->getStanzaChannel()->sendPresence(response);
+		onPresenceChanged(response);
+	}
+}
+
+void User::setConnected(bool connected) {
+	m_connected = connected;
+	setIgnoreDisconnect(false);
+	updateLastActivity();
+
+	sendCurrentPresence();
+}
+
 void User::handlePresence(Swift::Presence::ref presence) {
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 	if (!m_connected) {
@@ -148,23 +191,7 @@ void User::handlePresence(Swift::Presence::ref presence) {
 		return;
 	}
 
-	Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
-	if (highest) {
-		Swift::Presence::ref response = Swift::Presence::create(highest);
-		response->setTo(presence->getFrom().toBare());
-		response->setFrom(m_component->getJID());
-		m_component->getStanzaChannel()->sendPresence(response);
-		LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << response->getType());
-		onPresenceChanged(highest);
-	}
-	else {
-		Swift::Presence::ref response = Swift::Presence::create();
-		response->setTo(m_jid.toBare());
-		response->setFrom(m_component->getJID());
-		response->setType(Swift::Presence::Unavailable);
-		m_component->getStanzaChannel()->sendPresence(response);
-		onPresenceChanged(response);
-	}
+	sendCurrentPresence();
 }
 
 void User::handleSubscription(Swift::Presence::ref presence) {