Even even even more authentication fixes