Correct form fields