CS-5536 - Fix confirmation form to display all fields