diff --git a/src/VCardManager.cpp b/src/VCardManager.cpp
index dfc77b8..b316699 100644
--- a/src/VCardManager.cpp
+++ b/src/VCardManager.cpp
@@ -1,85 +1,86 @@
 /*
  *  Kaidan - A user-friendly XMPP client for every device!
  *
  *  Copyright (C) 2016-2020 Kaidan developers and contributors
  *  (see the LICENSE file for a full list of copyright authors)
  *
  *  Kaidan is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  In addition, as a special exception, the author of Kaidan gives
  *  permission to link the code of its release with the OpenSSL
  *  project's "OpenSSL" library (or with modified versions of it that
  *  use the same license as the "OpenSSL" library), and distribute the
  *  linked executables. You must obey the GNU General Public License in
  *  all respects for all of the code used other than "OpenSSL". If you
  *  modify this file, you may extend this exception to your version of
  *  the file, but you are not obligated to do so.  If you do not wish to
  *  do so, delete this exception statement from your version.
  *
  *  Kaidan is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "VCardManager.h"
 #include "AvatarFileStorage.h"
 #include "Kaidan.h"
 #include <QXmppClient.h>
 #include <QXmppUtils.h>
 #include <QXmppVCardIq.h>
 
 VCardManager::VCardManager(QXmppClient *client, AvatarFileStorage *avatars, QObject *parent)
 	: QObject(parent), client(client), manager(client->vCardManager()), avatarStorage(avatars)
 {
 	connect(&manager, &QXmppVCardManager::vCardReceived, this, &VCardManager::handleVCard);
 	connect(client, &QXmppClient::presenceReceived, this, &VCardManager::handlePresence);
 	connect(Kaidan::instance(), &Kaidan::vCardRequested, this, &VCardManager::fetchVCard);
 
 	// Currently we're not requesting the own VCard on every connection because it is probably
 	// way too resource intensive on mobile connections with many reconnects.
 	// Actually we would need to request our own avatar, calculate the hash of it and publish
 	// that in our presence.
 	//
 	// XEP-0084: User Avatar - probably best option (as long as the servers support XEP-0398:
 	//                         User Avatar to vCard-Based Avatars Conversion)
 }
 
 void VCardManager::fetchVCard(const QString& jid)
 {
 	if (client->state() == QXmppClient::ConnectedState)
 		client->vCardManager().requestVCard(jid);
 	else
 		qWarning() << "[VCardManager] Could not fetch VCard: Not connected to a server";
 }
 
 void VCardManager::handleVCard(const QXmppVCardIq &iq)
 {
-	if (!iq.photo().isEmpty())
-		avatarStorage->addAvatar(QXmppUtils::jidToBareJid(iq.from()), iq.photo());
+	if (!iq.photo().isEmpty()) {
+		avatarStorage->addAvatar(QXmppUtils::jidToBareJid(iq.from().isEmpty() ? client->configuration().jid() : iq.from()), iq.photo());
+	}
 
 	emit vCardReceived(iq);
 }
 
 void VCardManager::handlePresence(const QXmppPresence &presence)
 {
 	if (presence.vCardUpdateType() == QXmppPresence::VCardUpdateValidPhoto) {
 		QString hash = avatarStorage->getHashOfJid(QXmppUtils::jidToBareJid(presence.from()));
 		QString newHash = presence.photoHash().toHex();
 
 		// check if hash differs and we need to refetch the avatar
 		if (hash != newHash)
 			manager.requestVCard(QXmppUtils::jidToBareJid(presence.from()));
 
 	} else if (presence.vCardUpdateType() == QXmppPresence::VCardUpdateNoPhoto) {
 		QString bareJid = QXmppUtils::jidToBareJid(presence.from());
 		avatarStorage->clearAvatar(bareJid);
 	}
 	// ignore VCardUpdateNone (protocol unsupported) and VCardUpdateNotReady
 }