Properly handle PRI TON and allow changing number (bug #3493, with mods)