Merged EAP and XAuth handling