Updated registration flow