Thanks @bednar @mkachline and @Felipe Chang. Unfortunately, using token based is not an option for this client but we've already raised that alternative. Probably we'll consider @Felipe Chang option for now as an interim solution.