feature #2796: Non expiring tokens, new default