diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index b86090b67f717488de8455da123615a123848d41..ecfe26db55ce9fd4732c518a91d696b778deb10e 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -440,13 +440,15 @@ void NetworkPluginServer::handleVCardPayload(const std::string &data) {
 		// TODO: ERROR
 		return;
 	}
-	std::string field;
+	std::string field = payload.fullname();
 
 	boost::shared_ptr<Swift::VCard> vcard(new Swift::VCard());
 
 	utf8::replace_invalid(payload.fullname().begin(), payload.fullname().end(), field.begin(), '_');
 	vcard->setFullName(field);
 
+	field = payload.nickname();
+
 	utf8::replace_invalid(payload.nickname().begin(), payload.nickname().end(), field.begin(), '_');
 	vcard->setNickname(field);