diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 1ad6a77c6cef7b74504028e4a17735b7344fa206..575d26eaa9de6cb5bfd7d78d7e7a1a4e8816bacd 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -259,6 +259,8 @@ class SubstrateSdk with ChangeNotifier {
     final idtyIndexTo = await sdk.webView!
         .evalJavascript('api.query.identity.identityIndexOf("$to")');
 
+    if (idtyIndexFrom == null || idtyIndexTo == null) return {};
+
     final certData = await sdk.webView!.evalJavascript(
             'api.query.cert.storageCertsByIssuer($idtyIndexFrom, $idtyIndexTo)') ??
         '';
diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart
index ecc32f7a8a3acf48f189badfb0489f63be7b5dc6..3aa3bb99ecfdc1247746d1c3d334d30e95c680f5 100644
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@@ -137,7 +137,7 @@ class WalletOptionsProvider with ChangeNotifier {
 
     _showText(String text,
         [double size = 18, bool bold = false, bool smooth = true]) {
-      log.d(text);
+      log.d('$address $text');
       return AnimatedFadeOutIn<String>(
         data: text,
         duration: Duration(milliseconds: smooth ? 200 : 0),
diff --git a/lib/screens/search_result.dart b/lib/screens/search_result.dart
index fb472f7f862ac298662e5178264654dd511a538c..a563873ba94e4e92e11420ac338ce14258b832a9 100644
--- a/lib/screens/search_result.dart
+++ b/lib/screens/search_result.dart
@@ -80,7 +80,6 @@ class SearchResultScreen extends StatelessWidget {
                     future: searchProvider.searchAddress(),
                     builder: (context, AsyncSnapshot<List?> snapshot) {
                       if (snapshot.connectionState == ConnectionState.done) {
-                        log.d(snapshot.data);
                         if (snapshot.data?.isEmpty ?? true) {
                           return duniterIndexer.searchIdentity(
                               context, searchProvider.searchController.text);
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index 36f3a9d2ffdb9a019fd8af77637cf4e25c81fd2e..84a0d748e7cc7036905b17ca417667d84cc87c03 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -127,7 +127,6 @@ class WalletViewScreen extends StatelessWidget {
                   future: sub.certState(defaultWallet.address!,
                       pubkey!), // .canCertify(_defaultWallet.address!, pubkey!),
                   builder: (context, AsyncSnapshot<Map<String, int>> snapshot) {
-                    // log.d(snapshot.data);
                     if (snapshot.data == null) return const SizedBox();
                     String duration = '';
                     if (snapshot.data!['certDelay'] != null ||
@@ -162,6 +161,7 @@ class WalletViewScreen extends StatelessWidget {
                         duration = 'months'.tr(args: [months.toString()]);
                       }
                     }
+
                     return Visibility(
                       visible: (snapshot.data != {}),
                       child: Column(children: <Widget>[
@@ -175,7 +175,7 @@ class WalletViewScreen extends StatelessWidget {
                                   color:
                                       const Color(0xffFFD58D), // button color
                                   child: InkWell(
-                                      key: const Key('copyKey'),
+                                      key: const Key('certify'),
                                       splashColor: orangeC, // inkwell color
                                       child: const Padding(
                                         padding: EdgeInsets.only(bottom: 0),