diff --git a/src/vcardresponder.cpp b/src/vcardresponder.cpp
index 7528c658542cc09266ecdc9486baaf4585df5902..594df095a5e15082063009ef00a548b021064d60 100644
--- a/src/vcardresponder.cpp
+++ b/src/vcardresponder.cpp
@@ -96,12 +96,9 @@ bool VCardResponder::handleGetRequest(const Swift::JID& from, const Swift::JID&
 	std::string name = to_.getUnescapedNode();
 	if (name.empty()) {
 		to_ = user->getJID();
-		name = to_.getUnescapedNode();
 	}
 
-	if (name.find_last_of("%") != std::string::npos) {
-		name.replace(name.find_last_of("%"), 1, "@");
-	}
+	name = Buddy::JIDToLegacyName(to_);
 
 	LOG4CXX_INFO(logger, from.toBare().toString() << ": Requested VCard of " << name);