#485-user roles - minor fixes