Improved WPA handling support of existing configuration