diff --git a/src/tests/usermanager.cpp b/src/tests/usermanager.cpp
index 84b2e0b9..cbe49747 100644
--- a/src/tests/usermanager.cpp
+++ b/src/tests/usermanager.cpp
@@ -217,7 +217,6 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 
 		CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
-		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
 		CPPUNIT_ASSERT(userManager->getUser("user@localhost"));
 
 		userManager->removeAllUsers();
diff --git a/src/userregistration.cpp b/src/userregistration.cpp
index cb512f8a..ef390afa 100644
--- a/src/userregistration.cpp
+++ b/src/userregistration.cpp
@@ -509,6 +509,7 @@ bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID
 		res.language = language;
 		res.encoding = encoding;
 		res.vip = 0;
+		res.id = 0;
 		registerUser(res);
 	}
 	else {