Fix accountService