diff --git a/src/apps.js b/src/apps.js
index e209edd9f..1e98fa93f 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -713,7 +713,7 @@ function backupApp(app, addonsToBackup, callback) {
         async.series([
             ignoreError(shell.sudo.bind(null, 'mountSwap', [ BACKUP_SWAP_CMD, '--on' ])),
             addons.backupAddons.bind(null, app, addonsToBackup),
-            shell.sudo.bind(null, 'backupApp', [ BACKUP_APP_CMD,  app.id, result.url, result.backupKey ]),
+            shell.sudo.bind(null, 'backupApp', [ BACKUP_APP_CMD,  app.id, result.url, result.backupKey, result.sessionToken ]),
             ignoreError(shell.sudo.bind(null, 'unmountSwap', [ BACKUP_SWAP_CMD, '--off' ])),
         ], function (error) {
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
diff --git a/src/backups.js b/src/backups.js
index b5d9ef722..0178be6e1 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -60,7 +60,12 @@ function getBackupUrl(app, appBackupIds, callback) {
     assert(!appBackupIds || util.isArray(appBackupIds));
     assert.strictEqual(typeof callback, 'function');
 
-    var filename = util.format('backup_%s-v%s.tar.gz', (new Date()).toISOString(), config.version());
+    var filename = '';
+    if (app) {
+        filename = util.format('appbackup_%s_%s-v%s.tar.gz', app.id, (new Date()).toISOString(), app.manifest.version);
+    } else {
+        filename = util.format('backup_%s-v%s.tar.gz', (new Date()).toISOString(), config.version());
+    }
 
     aws.getSignedUploadUrl(filename, function (error, result) {
         if (error) return callback(error);