Fix resetting deadlines. Closes BV-2.

Add in the current deadline as an option to the deadline selector, if it
doesn't exist.