diff --git a/src/transport.cpp b/src/transport.cpp
index b928d10a..ea22fe92 100644
--- a/src/transport.cpp
+++ b/src/transport.cpp
@@ -95,7 +95,7 @@ Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory, T
 		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));
 		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::BlockParser>("block", "urn:xmpp:block:0"));
-		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::InvisibleParser>("block", "urn:xmpp:invisible:0"));
+		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::InvisibleParser>("invisible", "urn:xmpp:invisible:0"));
 
 		m_server->addPayloadSerializer(new Swift::AttentionSerializer());
 		m_server->addPayloadSerializer(new Swift::XHTMLIMSerializer());
diff --git a/src/user.cpp b/src/user.cpp
index e6d6e832..d16d6bd0 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -153,7 +153,7 @@ void User::handlePresence(Swift::Presence::ref presence) {
 		response->setFrom(m_component->getJID());
 		m_component->getStanzaChannel()->sendPresence(response);
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << response->getType());
-		onPresenceChanged(response);
+		onPresenceChanged(highest);
 	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();