3.2 Captive portal fixes related with startup

Don't forward there is already a branch and a pull request for 3.4 #1317