Salt auth refactors