Grant + Usager fix