Changed login / added echo