Make autologin nicer 2