LoginWindow minor fix
fixed conflict