Removed unnecessary null checking
Now showing usernames as well