Fix problem with missing ids on forms