diff --git a/src/js/restore.js b/src/js/restore.js
index e14e2d1ca..e7bad6e01 100644
--- a/src/js/restore.js
+++ b/src/js/restore.js
@@ -261,11 +261,11 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
                 return;
             }
         } else if ($scope.mountlike(backupConfig.provider)) {
-            backupConfig.mountPoint = $scope.mountPoint;
             backupConfig.prefix = $scope.prefix;
             backupConfig.mountOptions = {};
 
             if (backupConfig.provider === 'cifs' || backupConfig.provider === 'sshfs' || backupConfig.provider === 'nfs') {
+                backupConfig.mountPoint = '/mnt/cloudronbackup'; // harcoded for ease of use
                 backupConfig.mountOptions.host = $scope.mountOptions.host;
                 backupConfig.mountOptions.remoteDir = $scope.mountOptions.remoteDir;
 
@@ -278,9 +278,12 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
                     backupConfig.mountOptions.privateKey = $scope.mountOptions.privateKey;
                 }
             } else if (backupConfig.provider === 'ext4') {
+                backupConfig.mountPoint = '/mnt/cloudronbackup'; // harcoded for ease of use
                 backupConfig.mountOptions.diskPath = $scope.diskPath;
+            } else if (backupConfig.provider === 'mountpoint') {
+                backupConfig.mountPoint = $scope.mountPoint;
             }
-        } else if (backupConfig.provider === 'filesystem' || backupConfig.provider === 'mountpoint') {
+        } else if (backupConfig.provider === 'filesystem') {
             backupConfig.backupFolder = $scope.configureBackup.backupFolder;
         }
 
diff --git a/src/restore.html b/src/restore.html
index a98a2f943..ea95ba485 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -93,20 +93,20 @@
                                     <select class="form-control" id="storageProviderProvider" ng-model="provider" ng-options="a.value as a.name for a in storageProvider" ng-change=clearForm()></select>
                                 </div>
 
-                                <!-- SSHFS/CIFS/NFS/mountpoint/ext4 -->
-                                <div class="form-group" ng-class="{ 'has-error': error.mountPoint }" ng-show="mountlike(provider)">
+                                <!-- mountpoint -->
+                                <div class="form-group" ng-class="{ 'has-error': error.mountPoint }" ng-show="provider === 'mountpoint'">
                                     <label class="control-label" for="inputConfigureMountPoint">Mountpoint</label>
-                                    <input type="text" class="form-control" ng-model="mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="busy" placeholder="Folder where filesystem is mounted" ng-required="mountlike(provider)">
+                                    <input type="text" class="form-control" ng-model="mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="busy" placeholder="Folder where filesystem is mounted" ng-required="provider === 'mountpoint'">
                                 </div>
 
-                                <!-- CIFS/NFS -->
-                                <div class="form-group" ng-show="provider === 'cifs' || provider === 'nfs'">
+                                <!-- CIFS/NFS/SSHFS -->
+                                <div class="form-group" ng-show="provider === 'cifs' || provider === 'nfs' || provider === 'sshfs'">
                                     <label class="control-label" for="configureBackupHost">Server IP or Hostname</label>
                                     <input type="text" class="form-control" ng-model="mountOptions.host" id="configureBackupHost" name="host" ng-disabled="busy" placeholder="Server IP or hostname" ng-required="provider === 'cifs' || provider === 'nfs'">
                                 </div>
 
-                                <!-- CIFS/NFS -->
-                                <div class="form-group" ng-show="provider === 'cifs' || provider === 'nfs'">
+                                <!-- CIFS/NFS/SSHFS -->
+                                <div class="form-group" ng-show="provider === 'cifs' || provider === 'nfs' || provider === 'sshfs'">
                                     <label class="control-label" for="configureBackupRemoteDir">Remote Directory</label>
                                     <input type="text" class="form-control" ng-model="mountOptions.remoteDir" id="configureBackupRemoteDir" name="remoteDir" ng-disabled="busy" placeholder="/share" ng-required="provider === 'cifs' || provider === 'nfs'">
                                 </div>
@@ -172,7 +172,7 @@
                                     <input type="text" class="form-control" ng-model="bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="busy" ng-required="s3like(provider)">
                                 </div>
 
-                                <div class="form-group" ng-class="{ 'has-error': error.prefix }" ng-show="s3like(provider) || provider === 'gcs'">
+                                <div class="form-group" ng-class="{ 'has-error': error.prefix }" ng-show="provider !== 'filesystem' && provider !== 'noop'">
                                     <label class="control-label" for="inputConfigureBackupPrefix">Prefix</label>
                                     <input type="text" class="form-control" ng-model="prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="busy" placeholder="Prefix for backup file names">
                                 </div>
diff --git a/src/views/backups.js b/src/views/backups.js
index ad2691fc1..7a86783ea 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -610,7 +610,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
                 backupConfig.mountOptions = {};
 
                 if (backupConfig.provider === 'cifs' || backupConfig.provider === 'sshfs' || backupConfig.provider === 'nfs') {
-                    backupConfig.mountPoint = '/mnt/cloudronbackups'; // harcoded for ease of use
+                    backupConfig.mountPoint = '/mnt/cloudronbackup'; // harcoded for ease of use
                     backupConfig.mountOptions.host = $scope.configureBackup.mountOptions.host;
                     backupConfig.mountOptions.remoteDir = $scope.configureBackup.mountOptions.remoteDir;
 
@@ -623,7 +623,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
                         backupConfig.mountOptions.privateKey = $scope.configureBackup.mountOptions.privateKey;
                     }
                 } else if (backupConfig.provider === 'ext4') {
-                    backupConfig.mountPoint = '/mnt/cloudronbackups'; // harcoded for ease of use
+                    backupConfig.mountPoint = '/mnt/cloudronbackup'; // harcoded for ease of use
                     backupConfig.mountOptions.diskPath = $scope.configureBackup.mountOptions.diskPath;
                 } else if (backupConfig.provider === 'mountpoint') {
                     backupConfig.mountPoint = $scope.configureBackup.mountPoint;