Client token fix