Added option --force-eid to the client