Fixed token reset issue