Don't want to break the uploaded version with a potentially non working version.

So here is a version with a workaround for the issue on WAP authentication when the network name has a space.

Could someone test this and post if successful in authenticating?