#485-user roles - minor fixes
Merge pull request #274 from Nurhashimah/master

#485-user roles - minor fixes