Fix validation on submit and update receiverName via event