additional changes for accountsservice, close #73