Minor fix related to token requesting