More fixes, hopefully this is the last change I will have to make to the WifiAutoLogin system...