Update and improved server side form validation
Re-enabled re-direct