Email Token changes