added no-login option