Form now sends the right button, resolves #257
Merge pull request #258 from Fidilip/257_Form-always-sends-second-button

Form now sends the right button, resolves #257