Fix issue where checkout failing on confirm step would redirect back to address step

Fixes #4117