Email tokens refactor