#368 martinyde - Changed variant selection rule for staff users