Added support for a per-account token on the server side