#master: form validation added