Improving registration flow