More auth service tweaks