Use entity number instead of name for better email support