Pjhagel dev

Can you pls add this changes, as the beforeSubmit doesn't exist anymore

Thanks Philipp