Add options
Tidy up the access token generation with auto login