server side form validation
merge fix