Fix bug with service user