More half-baked authentication changes