Re: #489 - microsoft translate

* added logic to handle new token requests