#546 - Fix OAuth tokens issue

For fixing OAuth issue, #546.