Tweak to onboarding connection forwarder