Combine some conditionals in auth change