So before getting on the plane this morning, I go into the start-up settings and set wifi not to start on boot. Seems OK. Shutdown, and board...
Now, when I boot into xfce, I get a login screen (was set to auto-login), and password request. If I enter these, I just end up with the login prompt...