changes for save certificate flow