diff --git a/dashboard/develop.sh b/dashboard/develop.sh
index 01f2eebf0..a4ebdc473 100755
--- a/dashboard/develop.sh
+++ b/dashboard/develop.sh
@@ -3,7 +3,7 @@
 set -eu
 
 echo "=> Set API origin"
-export VITE_API_ORIGIN="https://my.nebulon.space"
+export VITE_API_ORIGIN="https://my.smartserver.io"
 
 # only really used for prod builds to bust cache
 export VITE_CACHE_ID="develop"
diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 63d28f19c..22a2bbfa9 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -1682,7 +1682,7 @@
         },
         "uninstallDialog": {
             "title": "Uninstall {{ app }}",
-            "description": "This will immediately uninstall <b>{{ app }}</b> and remove all its data.",
+            "description": "This will uninstall <b>{{ app }}</b> and remove all its data.",
             "uninstallAction": "Uninstall"
         },
         "domainCollisionDialog": {
@@ -1792,7 +1792,12 @@
             "title": "Archive",
             "description": "The latest app backup will be added to the App Archive. The app will be uninstalled, but can be restored from the Backups View. Other backups will be cleaned up based on the backup policy.",
             "action": "Archive",
-            "latestBackupInfo": "The last backup was created at : {{ timestamp }}"
+            "latestBackupInfo": "The last backup was created at {{date}}.",
+            "noBackup": "This app has no backup. Archiving requires at least one backup."
+        },
+        "archiveDialog": {
+            "title": "Archive {{app}}",
+            "description": "This will uninstall the app and put the app's latest backup created at {{date}} in the App Archive."
         }
     },
     "login": {
diff --git a/dashboard/public/views/app.html b/dashboard/public/views/app.html
index 325ba7a3c..fbcead3b7 100644
--- a/dashboard/public/views/app.html
+++ b/dashboard/public/views/app.html
@@ -177,6 +177,24 @@
   </div>
 </div>
 
+<!-- Modal archive app -->
+<div class="modal fade" id="archiveModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'app.archiveDialog.title' | tr:{ app: (app.label || app.fqdn) } }}</h4>
+      </div>
+      <div class="modal-body">
+        <p ng-bind-html="'app.archiveDialog.description' | tr:{ date: (uninstall.latestBackup.creationTime | prettyDate) }"></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="uninstall.submit('archive')" ng-disabled="uninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="uninstall.busy"></i> {{ 'app.archive.action' | tr }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal uninstall app -->
 <div class="modal fade" id="uninstallModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -189,7 +207,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-click="uninstall.submit()" ng-disabled="uninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="uninstall.busy"></i> {{ 'app.uninstallDialog.uninstallAction' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="uninstall.submit('uninstall')" ng-disabled="uninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="uninstall.busy"></i> {{ 'app.uninstallDialog.uninstallAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -1726,8 +1744,9 @@
           <div class="col-md-12">
             <label class="control-label">{{ 'app.archive.title' | tr }}</label>
             <p>{{ 'app.archive.description' | tr }}</p>
-            <p ng-bind-html="'app.archive.latestBackupInfo' | tr }"></p>
-            <button class="btn btn-default pull-right" ng-click="uninstall.archive()">{{ 'app.archive.action' | tr }}</button>
+            <p class="text-bold text-success" ng-show="uninstall.latestBackup" ng-bind-html="'app.archive.latestBackupInfo' | tr:{ date: (uninstall.latestBackup.creationTime | prettyDate) }"></p>
+            <p class="text-bold text-warning" ng-show="!uninstall.latestBackup" ng-bind-html="'app.archive.noBackup' | tr"></p>
+            <button ng-disabled="!uninstall.latestBackup" class="btn btn-default pull-right" ng-click="uninstall.ask('archive')">{{ 'app.archive.action' | tr }}</button>
           </div>
         </div>
         <hr/>
@@ -1735,7 +1754,7 @@
           <div class="col-md-12">
             <label class="control-label">{{ 'app.uninstall.uninstall.title' | tr }}</label>
             <p>{{ 'app.uninstall.uninstall.description' | tr }}</p>
-            <button class="btn btn-danger pull-right" ng-click="uninstall.ask()">{{ 'app.uninstall.uninstall.uninstallAction' | tr }}</button>
+            <button class="btn btn-danger pull-right" ng-click="uninstall.ask('uninstall')">{{ 'app.uninstall.uninstall.uninstallAction' | tr }}</button>
           </div>
         </div>
       </div>
diff --git a/dashboard/public/views/app.js b/dashboard/public/views/app.js
index 91810271a..5cbfd3e24 100644
--- a/dashboard/public/views/app.js
+++ b/dashboard/public/views/app.js
@@ -1735,7 +1735,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         error: {},
         busyRunState: false,
         startButton: false,
-        busyArchive: false,
         latestBackup: null,
 
         toggleRunState: function (confirmStop) {
@@ -1770,40 +1769,36 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             });
         },
 
-        ask: function () {
-            $('#uninstallModal').modal('show');
+        ask: function (what) {
+            if (what === 'uninstall') {
+                $('#uninstallModal').modal('show');
+            } else {
+                $('#archiveModal').modal('show');
+            }
         },
 
-        archive: function () {
-            $scope.uninstall.busyArchive = true;
-
-            Client.archiveApp($scope.app.id, $scope.uninstall.latestBackup.id, function (error) {
-                if (error && error.statusCode === 402) { // unpurchase failed
-                    Client.error('Relogin to Cloudron App Store');
-                } else if (error) {
-                    Client.error(error);
-                } else {
-                    $location.path('/apps');
-                }
-
-                $scope.uninstall.busyArchive = false;
-            });
-        },
-
-        submit: function () {
+        submit: function (what) {
             $scope.uninstall.busy = true;
 
             var NOOP = function (next) { return next(); };
             var stopAppTask = $scope.app.taskId ? Client.stopTask.bind(null, $scope.app.taskId) : NOOP;
 
             stopAppTask(function () { // ignore error
-                Client.uninstallApp($scope.app.id, function (error) {
+                const func = what === 'uninstall' ?
+                    Client.uninstallApp.bind(null, $scope.app.id) :
+                    Client.archiveApp.bind(Client, $scope.app.id, $scope.uninstall.latestBackup.id);
+
+                func(function (error) {
                     if (error && error.statusCode === 402) { // unpurchase failed
                         Client.error('Relogin to Cloudron App Store');
                     } else if (error) {
                         Client.error(error);
                     } else {
-                        $('#uninstallModal').modal('hide');
+                        if (what === 'uninstall') {
+                            $('#uninstallModal').modal('hide');
+                        } else {
+                            $('#archiveModal').modal('hide');
+                        }
                         $location.path('/apps');
                     }