Fixes #3182 - Make IP optional in some circumstances
Fixes #3196 - Switch tokens to default to on