Added unescaping for usernames with @