diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index f717666128ec4358c80dd856d9c3869e59292ace..83ff9ae516c63f8c11c5431cb8163353c14805c0 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -318,7 +318,7 @@ public class Account extends AbstractEntity {
 	}
 
 	public String getUsername() {
-		return jid.getLocal();
+		return jid.getEscapedLocal();
 	}
 
 	public boolean setJid(final Jid next) {