diff --git a/lbrynet/wallet/account.py b/lbrynet/wallet/account.py
index 64fc969de..d81b59c34 100644
--- a/lbrynet/wallet/account.py
+++ b/lbrynet/wallet/account.py
@@ -1,3 +1,4 @@
+import json
 import logging
 
 from twisted.internet import defer
@@ -32,19 +33,33 @@ class Account(BaseAccount):
 
     @defer.inlineCallbacks
     def maybe_migrate_certificates(self):
-        failed, succeded, done, total = 0, 0, 0, 0
+        if not self.certificates:
+            return
+
+        addresses = {}
+        results = {
+            'total': 0,
+            'not-a-claim-tx': 0,
+            'migrate-success': 0,
+            'migrate-failed': 0,
+            'previous-success': 0,
+            'previous-corrupted': 0
+        }
+
         for maybe_claim_id in self.certificates.keys():
-            total += 1
+            results['total'] += 1
             if ':' not in maybe_claim_id:
                 claims = yield self.ledger.network.get_claims_by_ids(maybe_claim_id)
                 claim = claims[maybe_claim_id]
-                #txhash = unhexlify(claim['txid'])[::-1]
                 tx = yield self.ledger.get_transaction(claim['txid'])
                 if tx is not None:
                     txo = tx.outputs[claim['nout']]
-                    assert txo.script.is_claim_involved,\
-                        "Certificate with claim_id {} doesn't point to a valid transaction."\
-                        .format(maybe_claim_id)
+                    if not txo.script.is_claim_involved:
+                        results['not-a-claim-tx'] += 1
+                        raise ValueError(
+                            "Certificate with claim_id {} doesn't point to a valid transaction."
+                            .format(maybe_claim_id)
+                        )
                     tx_nout = '{txid}:{nout}'.format(**claim)
                     self.certificates[tx_nout] = self.certificates[maybe_claim_id]
                     del self.certificates[maybe_claim_id]
@@ -52,26 +67,36 @@ class Account(BaseAccount):
                         "Migrated certificate with claim_id '%s' ('%s') to a new look up key %s.",
                         maybe_claim_id, txo.script.values['claim_name'], tx_nout
                     )
-                    succeded += 1
+                    results['migrate-success'] += 1
                 else:
+                    addresses.setdefault(claim['address'], 0)
+                    addresses[claim['address']] += 1
                     log.warning(
                         "Failed to migrate claim '%s', it's not associated with any of your addresses.",
                         maybe_claim_id
                     )
-                    failed += 1
+                    results['migrate-failed'] += 1
             else:
                 try:
                     txid, nout = maybe_claim_id.split(':')
                     tx = yield self.ledger.get_transaction(txid)
                     if tx.outputs[int(nout)].script.is_claim_involved:
-                        done += 1
+                        results['previous-success'] += 1
                     else:
-                        failed += 1
+                        results['previous-corrupted'] += 1
                 except Exception:
                     log.exception("Couldn't verify certificate with look up key: %s", maybe_claim_id)
-                    failed += 1
+                    results['previous-corrupted'] += 1
 
-        log.info('Checked: %s, Done: %s, Converted: %s, Failed: %s', total, done, succeded, failed)
+        self.wallet.save()
+        log.info('verifying and possibly migrating certificates:')
+        log.info(json.dumps(results, indent=2))
+        if addresses:
+            log.warning('failed for addresses:')
+            log.warning(json.dumps(
+                [{'address': a, 'number of certificates': c} for a, c in addresses.items()],
+                indent=2
+            ))
 
     def get_balance(self, confirmations=6, include_claims=False, **constraints):
         if not include_claims:
@@ -108,8 +133,8 @@ class Account(BaseAccount):
         )
 
     @classmethod
-    def from_dict(cls, ledger, d: dict) -> 'Account':
-        account = super().from_dict(ledger, d)
+    def from_dict(cls, ledger, wallet, d: dict) -> 'Account':
+        account = super().from_dict(ledger, wallet, d)
         account.certificates = d.get('certificates', {})
         return account
 
diff --git a/tests/unit/wallet/test_account.py b/tests/unit/wallet/test_account.py
index b011d28ac..6469d9380 100644
--- a/tests/unit/wallet/test_account.py
+++ b/tests/unit/wallet/test_account.py
@@ -3,6 +3,7 @@ from twisted.internet import defer
 
 from lbrynet.wallet.ledger import MainNetLedger, WalletDatabase
 from lbrynet.wallet.account import Account
+from torba.wallet import Wallet
 
 
 class TestAccount(unittest.TestCase):
@@ -13,7 +14,7 @@ class TestAccount(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_generate_account(self):
-        account = Account.generate(self.ledger, u'lbryum')
+        account = Account.generate(self.ledger, Wallet(), 'lbryum')
         self.assertEqual(account.ledger, self.ledger)
         self.assertIsNotNone(account.seed)
         self.assertEqual(account.public_key.ledger, self.ledger)
@@ -37,7 +38,7 @@ class TestAccount(unittest.TestCase):
     @defer.inlineCallbacks
     def test_generate_account_from_seed(self):
         account = Account.from_dict(
-            self.ledger, {
+            self.ledger, Wallet(), {
                 "seed":
                     "carbon smart garage balance margin twelve chest sword toas"
                     "t envelope bottom stomach absent"
@@ -86,6 +87,6 @@ class TestAccount(unittest.TestCase):
             }
         }
 
-        account = Account.from_dict(self.ledger, account_data)
+        account = Account.from_dict(self.ledger, Wallet(), account_data)
         account_data['ledger'] = 'lbc_mainnet'
         self.assertDictEqual(account_data, account.to_dict())
diff --git a/tests/unit/wallet/test_ledger.py b/tests/unit/wallet/test_ledger.py
index ca66eb09a..7d5bf79ce 100644
--- a/tests/unit/wallet/test_ledger.py
+++ b/tests/unit/wallet/test_ledger.py
@@ -35,7 +35,7 @@ class LedgerTestCase(unittest.TestCase):
     def setUp(self):
         conf.initialize_settings(False)
         self.ledger = MainNetTestLedger()
-        self.account = Account.generate(self.ledger, u"lbryum")
+        self.account = Account.generate(self.ledger, Wallet(), "lbryum")
         return self.ledger.db.start()
 
     def tearDown(self):
diff --git a/tests/unit/wallet/test_transaction.py b/tests/unit/wallet/test_transaction.py
index f4f14f227..e988bf3f8 100644
--- a/tests/unit/wallet/test_transaction.py
+++ b/tests/unit/wallet/test_transaction.py
@@ -222,7 +222,7 @@ class TestTransactionSigning(unittest.TestCase):
     @defer.inlineCallbacks
     def test_sign(self):
         account = self.ledger.account_class.from_dict(
-            self.ledger, {
+            self.ledger, Wallet(), {
                 "seed":
                     "carbon smart garage balance margin twelve chest sword toas"
                     "t envelope bottom stomach absent"