some bug fixes related to new user flow