I feel like you answered your own question here. If you want to do right by them, take care of it early.
and in another note, there is nothing better than being told “we can do better than that” when you give a salary figure. I got that comment 10 years ago from my current job.