Add display name in more cases
Merge pull request #799 from spicyj/display-name

Add display name in more cases