Minor internal bugfix to support user onboarding.