Fixed DatePicker

Fixed application to collect current date/default date even if the user
did not change the date picker value.