Added option to not auto-login