Merge "Allow only valid EAP configs"