Export oauth tokens issue #639

Solves #639