Fix issue with form id and default button attributes