Updated user role handling.