fixes to email picker for holidays and incrementing current