Submit buttons in some forms fix