Making login-screen mode work again