Fix in login system mode