Fix Leave Type error to always use required fields