diff --git a/js/controllers/setup.js b/js/controllers/setup.js
index 3ac730299..f2409c204 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/setup.js
@@ -81,6 +81,7 @@ angular.module('copayApp.controllers').controller('SetupController',
           passphrase: passphrase,
         };
         var w = walletFactory.create(opts);
+        backupService.download(w);
         controllerUtils.startNetwork(w, $scope);
       });
     };
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 6503d46ab..e01292886 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -70,6 +70,7 @@ angular.module('copayApp.controllers').controller('SigninController',
               notification.error('Unknown error');
             controllerUtils.onErrorDigest();
           } else {
+            backupService.download(w);
             controllerUtils.startNetwork(w, $scope);
           }
         });
diff --git a/js/services/backupService.js b/js/services/backupService.js
index 689604e47..0b7375c0e 100644
--- a/js/services/backupService.js
+++ b/js/services/backupService.js
@@ -11,10 +11,12 @@ BackupService.prototype.getName = function(wallet) {
 
 BackupService.prototype.download = function(wallet) {
   var ew = wallet.toEncryptedObj();
-  var timestamp = +(new Date());
-  var walletName = this.getName(wallet);
-  var filename = walletName + '-' + timestamp + '-keybackup.json.aes';
-  this.notifications.success('Backup created', 'Encrypted backup file saved.');
+  var partial = !wallet.publicKeyRing.isComplete();
+  var walletName = this.getName(wallet) + (partial ? '-Partial' : '');
+  var filename = walletName + '-keybackup.json.aes';
+
+  var notify = partial ? 'Partial backup created' : 'Backup created';
+  this.notifications.success(notify, 'Encrypted backup file saved.');
   var blob = new Blob([ew], {
     type: 'text/plain;charset=utf-8'
   });