Unify auth state variables