Updated datepicker and user mail setting