Needed zlogin changes too