bug fixing for accountservice