Fix bug with form and modified wording