Tkt 2128: Onboarding Improvements