Fixed some remaining issues with autologin.