Fix date prepopulation. Closes #1629