fix form validation errors
Merge branch 'fixg2_branch'