CRM-12317 fix domain tokens