Fix duplication of some form fields