Reworking sponsor form to always eagerly return

- Fixes #529