Fixed onboarding workflow