GEP-23 Added fields for conirmation page