Addresses issue #1032 If a token is created with no p/t then the local db value will be passed instead. If a value is provided then that will be used instead.