Facing the same issue in our Social auth setup as well.