diff --git a/dashboard/public/views/app.js b/dashboard/public/views/app.js
index 4608ca262..b90446533 100644
--- a/dashboard/public/views/app.js
+++ b/dashboard/public/views/app.js
@@ -2291,7 +2291,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             }
         });
 
-        var filename = 'app-backup-config-' + (new Date()).toISOString().replace(/:|T/g,'-').replace(/\..*/,'') + ' (' + $scope.app.fqdn + ')' + '.json';
+        const filename = `${$scope.app.fqdn}-backup-config-${(new Date(backup.creationTime)).toISOString().split('T')[0]}.json`;
         download(filename, JSON.stringify(tmp, null, 4));
     };
 
diff --git a/dashboard/public/views/backups.html b/dashboard/public/views/backups.html
index 330a37d67..deb30bd73 100644
--- a/dashboard/public/views/backups.html
+++ b/dashboard/public/views/backups.html
@@ -794,7 +794,7 @@
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: middle;">
                   <button class="btn btn-xs btn-default" ng-click="archiveRestore.show(archive)" uib-tooltip="Restore from Archive"><i class="fas fa-history"></i></button>
-                  <button class="btn btn-xs btn-default" ng-click="downloadConfig(archive)" uib-tooltip="{{ 'backups.listing.tooltipDownloadBackupConfig' | tr }}"><i class="fas fa-file-alt"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="downloadConfig(archive, true)" uib-tooltip="{{ 'backups.listing.tooltipDownloadBackupConfig' | tr }}"><i class="fas fa-file-alt"></i></button>
                   <button class="btn btn-xs btn-danger" ng-click="archiveDelete.ask(archive)" uib-tooltip="Delete Archive"><i class="fa fa-trash-alt"></i></button>
                 </td>
               </tr>
diff --git a/dashboard/public/views/backups.js b/dashboard/public/views/backups.js
index 9eee605ee..010946707 100644
--- a/dashboard/public/views/backups.js
+++ b/dashboard/public/views/backups.js
@@ -501,7 +501,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
         document.body.removeChild(element);
     }
 
-    $scope.downloadConfig = function (backup) { // can also be a archive object
+    $scope.downloadConfig = function (backup, isArchive) { // can also be a archive object
         // secrets and tokens already come with placeholder characters we remove them
         var tmp = {
             remotePath: backup.remotePath,
@@ -512,7 +512,13 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
             if ($scope.backupConfig[k] !== SECRET_PLACEHOLDER) tmp[k] = $scope.backupConfig[k];
         });
 
-        var filename = 'cloudron-backup-config-' + (new Date()).toISOString().replace(/:|T/g,'-').replace(/\..*/,'') + ' (' + $scope.config.adminFqdn + ')' + '.json';
+        let filename;
+        if (isArchive) {
+            filename = `${backup.appConfig.fqdn}-archive-config-${(new Date(backup.creationTime)).toISOString().split('T')[0]}.json`;
+        } else {
+            filename = `${$scope.config.adminFqdn}-backup-config-${(new Date(backup.creationTime)).toISOString().split('T')[0]}.json`;
+        }
+
         download(filename, JSON.stringify(tmp, null, 4));
     };