Really (at least it seems so) fix auth migration issues