Bring back service restart on first run

[closes #5]