Follow-up from "Persist and surface prefilled variables from PEP"

The following discussion from !207861 (merged) should be addressed:

Edited by Hordur Freyr Yngvason