WIP role user fix