Fixed generation of the submission form - for real this time