Simplify warning message
Make EAP-Key-Name things work