PIM-1972 : fix user context spec