Change barrier to use tenant sessions instead of admin