Updated with preferences for setting OAuth tokens