Fixed login, validation