fix form-fields for names yet again.