Updates to users helper and auth helper