Working version to deploy for demo

There are a couple of small fixes here that allow the full flow to be clicked through.

Please review and if you're happy we should merge it and deploy to staging or live, ready to demo on Monday morning.