diff --git a/src/cheogram/java/com/cheogram/android/WebxdcPage.java b/src/cheogram/java/com/cheogram/android/WebxdcPage.java
index 3847395cd891c47f56775473033636b371cafc03..ca66fc9e4353f4ff39f9ec27aa672a80fc0f9d8f 100644
--- a/src/cheogram/java/com/cheogram/android/WebxdcPage.java
+++ b/src/cheogram/java/com/cheogram/android/WebxdcPage.java
@@ -316,7 +316,8 @@ public class WebxdcPage implements ConversationPage {
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
 				return conversation.getMucOptions().getActualNick();
 			} else {
-				return conversation.getAccount().getDisplayName();
+				final String displayName = conversation.getAccount().getDisplayName();
+				return displayName == null || "".equals(displayName) ? conversation.getAccount().getUsername() : displayName;
 			}
 		}