MOAR changes to password user flow. Should be OK now. Closes #47