Fix an issue with form ids