Edit Goal re-authentication moved to inner step