Some fixes on logon screen