Fixed form validation and duplicate submissions
Merge fix