Change avatar service, closes #2