diff --git a/core.cpp b/core.cpp
index 32f614721..11a27b612 100644
--- a/core.cpp
+++ b/core.cpp
@@ -223,9 +223,9 @@ void Core::start()
     }
     else
     {
-        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
-        qDebug() << "self avatar missing, trying by id";
+        qDebug() << "Core: self avatar missing, trying by id";
         // this will leave a avatars/<selfid>.png duplicate of avatar.png, but whatever
+        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
         if (!pic.isNull() && !pic.size().isEmpty())
         {
             QByteArray data;
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 3134b2ee6..40239a701 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -444,7 +444,7 @@ void Widget::setStatusMessage(const QString &statusMessage)
 
 void Widget::addFriend(int friendId, const QString &userId)
 {
-    qDebug() << "Widget: Adding friend with id "+userId;
+    qDebug() << "Widget: Adding friend with id" << userId;
     Friend* newfriend = FriendList::addFriend(friendId, userId);
     QLayout* layout = contactListWidget->getFriendLayout(Status::Offline);
     layout->addWidget(newfriend->widget);
@@ -480,6 +480,7 @@ void Widget::addFriend(int friendId, const QString &userId)
     QPixmap avatar = Settings::getInstance().getSavedAvatar(userId.left(64)); // just to be safe
     if (!avatar.isNull())
     {
+        qWarning() << "Widget: loadded avatar for id" << userId;
         newfriend->chatForm->onAvatarChange(friendId, avatar);
         newfriend->widget->onAvatarChange(friendId, avatar);
     }