More auth fixes for 2.4 and lower