DS-1709 Make wording work for simple form
Merge pull request #382 from aschweer/DS-1709-Access-Step-UI

DS-1709 Make wording work for simple form