diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js
index 541c2deb47712a259375066312acd1a0316c588f..2878bf32de37e258b654adb47060e6b31d33ab75 100644
--- a/www/js/controllers/login-controllers.js
+++ b/www/js/controllers/login-controllers.js
@@ -324,6 +324,7 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
       .catch(function (err) {
         UIUtils.onError('ERROR.CRYPTO_UNKNOWN_ERROR')(err);
         $scope.computing = false;
+        $scope.autoComputePubkey = false; // Avoid a infinite loop (computePubkey -> onScryptFormChanged -> computePubkey)
         $scope.onScryptFormChanged();
       });
     }, 100);
diff --git a/www/js/services/crypto-services.js b/www/js/services/crypto-services.js
index 5ad567ce312e89a1ee26ab09c386f210da142105..c0e9a4f5386b23c530fd2c0475ea356e000d5f8a 100644
--- a/www/js/services/crypto-services.js
+++ b/www/js/services/crypto-services.js
@@ -168,7 +168,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
       };
       this.util.decode_base58 = function (a) { // TODO : move to abstract factory
         var i;
-        d = that.base58.decode(a);
+        var d = that.base58.decode(a);
         var b = new Uint8Array(d.length);
         for (i = 0; i < d.length; i++) b[i] = d[i];
         return b;
@@ -470,9 +470,9 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
       };
       this.util.decode_base58 = function(a) {
         var i;
-        a = that.base58.decode(a);
-        var b = new Uint8Array(a.length);
-        for (i = 0; i < a.length; i++) b[i] = a[i];
+        var d = that.base58.decode(a);
+        var b = new Uint8Array(d.length);
+        for (i = 0; i < d.length; i++) b[i] = d[i];
         return b;
       };
       this.util.decode_base64 = function (a) {
diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js
index 621fe5dc4f5994ef9d2f07666dc0f81327482715..7d8669be8158562b31a1263a0e750c2986cc8164 100644
--- a/www/js/services/device-services.js
+++ b/www/js/services/device-services.js
@@ -221,14 +221,6 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
         return !exports.enable && !exports.isDesktop();
       };
 
-      exports.openDevTool = function() {
-        if (exports.isDesktop()) {
-          // Get the current window
-          var win = nw && nw.Window && nw.Window.get();
-          if (win) win.showDevTools();
-        }
-      };
-
       exports.ready = function() {
         if (started) return $q.when();
         return startPromise || exports.start();
diff --git a/www/plugins/es/js/services/wallet-services.js b/www/plugins/es/js/services/wallet-services.js
index a498bba037d42a10f06356f1d8ac985f2129d986..66a8a2405a1f8fcd6a3962686b068fd7cff38358 100644
--- a/www/plugins/es/js/services/wallet-services.js
+++ b/www/plugins/es/js/services/wallet-services.js
@@ -1,6 +1,6 @@
 angular.module('cesium.es.wallet.services', ['ngResource', 'cesium.platform', 'cesium.es.http.services', 'cesium.es.crypto.services'])
 
-  .factory('esWallet', function($q, $rootScope, CryptoUtils, csPlatform, csWallet, esCrypto, esProfile, esHttp) {
+  .factory('esWallet', function($q, $rootScope, $timeout, CryptoUtils, csPlatform, csWallet, esCrypto, esProfile, esHttp) {
     'ngInject';
 
     var
diff --git a/www/templates/modal_about.html b/www/templates/modal_about.html
index da1c6304213dc7883046d70ce255b84edd1ddbc2..fb73558c8fc670623d62a3da9605c65035e5cd9e 100644
--- a/www/templates/modal_about.html
+++ b/www/templates/modal_about.html
@@ -34,11 +34,6 @@
         <span translate>ABOUT.PLEASE_REPORT_ISSUE</span>
         <h3>
           <a ng-click="openLink($event, $root.settings.newIssueUrl)" translate>ABOUT.REPORT_ISSUE</a>
-          <span class="hidden-sm hidden-xs" ng-if="::$root.device.isDesktop()">&nbsp;|&nbsp;<a
-                    ng-click="$root.device.openDevTool()">
-              {{'ABOUT.BTN_OPEN_DEV_WINDOW' | translate}}
-            </a>
-          </span>
         </h3>
       </ion-item>