Datepicker Fix [MJ-572]

All Tests Pass