Fix display of users' name
Merge branch 'develop'