Make ZAP optional for PLAIN mechanism