Change initiator script: proper user, add condition testing