[#42] Ensure the api-identity service is not set twice

- As the second attempt will raise an exception.
Merge branch 'hotfix/42'

Close #42
Merge branch 'master' into configurable-resolver