auth helper fixes