Re-adding proper tenant deduction after initial auth