Is Chuck's 18th bday going to be in the season finale??

I remember lectura a spoiler that dicho Jack comes back right before Chuck's bday bc wen he's 18 he official gets the company. I want him to have his bday during the last episode.