Updated the client to request a token if no token is set