diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 94cfad8b6..87b4dc3de 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -290,7 +290,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
           } else {
             self.isSingleAddress = !!ret.wallet.singleAddress;
             if (!opts.quiet)
-              self.updating =  ret.wallet.scanStatus == 'running';
+              self.updating = ret.wallet.scanStatus == 'running';
           }
           return cb(err, ret);
         });
@@ -1032,7 +1032,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-
   self.initGlidera = function(accessToken) {
     self.glideraEnabled = configService.getSync().glidera.enabled;
     self.glideraTestnet = configService.getSync().glidera.testnet;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 3603d8691..73078e279 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -160,7 +160,7 @@ angular.module('copayApp.services')
       });
 
       var skipKeyValidation = root.profile.isChecked(platformInfo.ua, credentials.walletId);
-      if (!skipKeyValidation) 
+      if (!skipKeyValidation)
         root.runValidation(client);
 
       $log.info('Binding wallet:' + credentials.walletId + ' Validating?:' + !skipKeyValidation);
@@ -176,7 +176,8 @@ angular.module('copayApp.services')
 
         function bindWallets(cb) {
           var l = root.profile.credentials.length;
-          var i = 0, totalBound = 0;
+          var i = 0,
+            totalBound = 0;
 
           if (!l) return cb();
 
@@ -387,8 +388,8 @@ angular.module('copayApp.services')
 
         // check if exist
         if (lodash.find(root.profile.credentials, {
-          'walletId': walletData.walletId
-        })) {
+            'walletId': walletData.walletId
+          })) {
           return cb(gettext('Cannot join the same wallet more that once'));
         }
       } catch (ex) {
@@ -479,7 +480,7 @@ angular.module('copayApp.services')
 
 
       var skipKeyValidation = root.profile.isChecked(platformInfo.ua, walletId);
-      if (!skipKeyValidation) 
+      if (!skipKeyValidation)
         root.runValidation(client);
 
       root.bindWalletClient(client);
@@ -502,32 +503,20 @@ angular.module('copayApp.services')
         });
       };
 
-      var handleImportedClient = function(cb) {
-        if (!opts.isImport) return cb();
-        $rootScope.$emit('Local/BackupDone', walletId);
-
-        if (!client.isComplete())
-          return cb();
-
-        storageService.setCleanAndScanAddresses(walletId, cb);
-      };
-
       walletService.updateRemotePreferences(client, {}, function() {
         $log.debug('Remote preferences saved for:' + walletId)
       });
 
       saveBwsUrl(function() {
-        handleImportedClient(function() {
-          root.setAndStoreFocus(walletId, function() {
-            storageService.storeProfile(root.profile, function(err) {
-
-              var config = configService.getSync();
-              if (config.pushNotifications.enabled)
-                pushNotificationsService.enableNotifications(root.walletClients);
-              return cb(err, walletId);
-            });
+        root.setAndStoreFocus(walletId, function() {
+          storageService.storeProfile(root.profile, function(err) {
 
+            var config = configService.getSync();
+            if (config.pushNotifications.enabled)
+              pushNotificationsService.enableNotifications(root.walletClients);
+            return cb(err, walletId);
           });
+
         });
       });
     };
@@ -563,8 +552,7 @@ angular.module('copayApp.services')
       var historyCache = str.historyCache ||  [];
 
       root.addAndBindWalletClient(walletClient, {
-        bwsurl: opts.bwsurl,
-        isImport: true
+        bwsurl: opts.bwsurl
       }, function(err, walletId) {
         if (err) return cb(err);
         root.setMetaData(walletClient, addressBook, historyCache, function(error) {
@@ -587,8 +575,7 @@ angular.module('copayApp.services')
         }
 
         root.addAndBindWalletClient(walletClient, {
-          bwsurl: opts.bwsurl,
-          isImport: true
+          bwsurl: opts.bwsurl
         }, cb);
       });
     };
@@ -619,8 +606,7 @@ angular.module('copayApp.services')
         }
 
         root.addAndBindWalletClient(walletClient, {
-          bwsurl: opts.bwsurl,
-          isImport: true
+          bwsurl: opts.bwsurl
         }, cb);
       });
     };
@@ -643,8 +629,7 @@ angular.module('copayApp.services')
         }
 
         root.addAndBindWalletClient(walletClient, {
-          bwsurl: opts.bwsurl,
-          isImport: true
+          bwsurl: opts.bwsurl
         }, cb);
       });
     };