diff --git a/src/friend.cpp b/src/friend.cpp
index df47d24ca..cb02a6d55 100644
--- a/src/friend.cpp
+++ b/src/friend.cpp
@@ -58,6 +58,9 @@ void Friend::loadHistory()
 
 void Friend::setName(QString name)
 {
+   if (name.isEmpty())
+       name = userID.publicKey;
+
     userName = name;
     if (userAlias.size() == 0)
     {