Switch token generation to the new oAuth token generation per application Closing #73