Fix form so it submits events properly