Fixed problem where access tokens were never overwritten