case 2274 - Better way of checking roles.