Make sure checkout payment only flow works

Fixes #3142