Fix anonymous token leak

Open Andrew Newdigate requested to merge feature/fix-anonymous-token-leak into develop