AccountService: Updating default account fix. II