Better handling of oauth token