Fix: Consolidating email token logic in one place.