more user flow fixes