add saveId and saveTo fields to bouncer token