diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index dc71b47bc..ee6d86332 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -335,20 +335,26 @@
 
           <!-- mountpoint -->
           <div class="form-group" ng-class="{ 'has-error': importBackup.error.mountPoint }" ng-show="importBackup.provider === 'mountpoint'">
-            <label class="control-label" for="inputConfigureMountPoint">{{ 'backups.configureBackupStorage.mountPoint' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="importBackup.busy" placeholder="Folder where filesystem is mounted" ng-required="importBackup.provider === 'mountpoint'">
+            <label class="control-label" for="inputImportMountPoint">{{ 'backups.configureBackupStorage.mountPoint' | tr }}</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountPoint" id="inputImportMountPoint" name="mountPoint" ng-disabled="importBackup.busy" placeholder="Folder where filesystem is mounted" ng-required="importBackup.provider === 'mountpoint'">
+          </div>
+
+          <!-- S3/Minio/SOS/GCS/SSHFS/CIFS/NFS/B2/Mountpoint -->
+          <div class="form-group" ng-class="{ 'has-error': importBackup.error.prefix }" ng-show="importBackup.provider !== 'filesystem'">
+            <label class="control-label" for="inputImportBackupPrefix">{{ 'backups.configureBackupStorage.prefix' | tr }}</label>
+            <input type="text" class="form-control" ng-model="importBackup.prefix" id="inputImportBackupPrefix" name="prefix" ng-disabled="importBackup.busy" placeholder="Prefix for backup file names">
           </div>
 
           <!-- CIFS/NFS/SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupHost">{{ 'backups.configureBackupStorage.server' | tr }} ({{ importBackup.provider }})</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.host" id="configureBackupHost" name="host" ng-disabled="importBackup.busy" placeholder="Server IP or hostname" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
+            <label class="control-label" for="importBackupHost">{{ 'backups.configureBackupStorage.server' | tr }} ({{ importBackup.provider }})</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.host" id="importBackupHost" name="host" ng-disabled="importBackup.busy" placeholder="Server IP or hostname" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
           </div>
 
           <!-- SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupPort">{{ 'backups.configureBackupStorage.port' | tr }}</label>
-            <input type="number" class="form-control" ng-model="importBackup.mountOptions.port" id="configureBackupPort" name="port" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
+            <label class="control-label" for="importBackupPort">{{ 'backups.configureBackupStorage.port' | tr }}</label>
+            <input type="number" class="form-control" ng-model="importBackup.mountOptions.port" id="importBackupPort" name="port" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
           </div>
 
           <!-- CIFS -->
@@ -360,14 +366,14 @@
 
            <!-- CIFS/NFS/SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupRemoteDir">{{ 'backups.configureBackupStorage.remoteDirectory' | tr }} ({{ importBackup.provider }})</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.remoteDir" id="configureBackupRemoteDir" name="remoteDir" ng-disabled="importBackup.busy" placeholder="/share" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
+            <label class="control-label" for="importBackupRemoteDir">{{ 'backups.configureBackupStorage.remoteDirectory' | tr }} ({{ importBackup.provider }})</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.remoteDir" id="importBackupRemoteDir" name="remoteDir" ng-disabled="importBackup.busy" placeholder="/share" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
           </div>
 
           <!-- EXT4/XFS -->
           <div class="form-group" ng-show="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'" ng-class="{ 'has-error': importBackup.error.diskPath }">
-            <label class="control-label" for="configureBackupDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.diskPath" id="configureBackupDiskPath" name="diskPath" ng-disabled="importBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'">
+            <label class="control-label" for="importBackupDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.diskPath" id="importBackupDiskPath" name="diskPath" ng-disabled="importBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'">
          </div>
 
           <!-- remotePath contains the prefix as well -->
@@ -378,26 +384,26 @@
 
           <!-- CIFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs'">
-            <label class="control-label" for="configureBackupUsername">{{ 'backups.configureBackupStorage.username' | tr }} ({{ importBackup.provider }})</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.username" id="configureBackupUsername" name="username" ng-disabled="importBackup.busy">
+            <label class="control-label" for="importBackupUsername">{{ 'backups.configureBackupStorage.username' | tr }} ({{ importBackup.provider }})</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.username" id="importBackupUsername" name="username" ng-disabled="importBackup.busy">
           </div>
 
           <!-- CIFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs'">
-            <label class="control-label" for="configureBackupPassword">{{ 'backups.configureBackupStorage.password' | tr }} ({{ importBackup.provider }})</label>
-            <input type="password" class="form-control" ng-model="importBackup.mountOptions.password" id="configureBackupPassword" name="password" ng-disabled="importBackup.busy" password-reveal>
+            <label class="control-label" for="importBackupPassword">{{ 'backups.configureBackupStorage.password' | tr }} ({{ importBackup.provider }})</label>
+            <input type="password" class="form-control" ng-model="importBackup.mountOptions.password" id="importBackupPassword" name="password" ng-disabled="importBackup.busy" password-reveal>
           </div>
 
           <!-- SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupUser">{{ 'backups.configureBackupStorage.user' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.user" id="configureBackupUser" name="user" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
+            <label class="control-label" for="importBackupUser">{{ 'backups.configureBackupStorage.user' | tr }}</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.user" id="importBackupUser" name="user" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
           </div>
 
           <!-- SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupPrivateKey">{{ 'backups.configureBackupStorage.privateKey' | tr }}</label>
-            <textarea class="form-control" ng-model="importBackup.mountOptions.privateKey" id="configureBackupPrivateKey" name="privateKey" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'"></textarea>
+            <label class="control-label" for="importBackupPrivateKey">{{ 'backups.configureBackupStorage.privateKey' | tr }}</label>
+            <textarea class="form-control" ng-model="importBackup.mountOptions.privateKey" id="importBackupPrivateKey" name="privateKey" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'"></textarea>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': importBackup.error.region }" ng-show="importBackup.provider === 's3'">
diff --git a/dashboard/src/views/app.js b/dashboard/src/views/app.js
index a36923652..59fc46a13 100644
--- a/dashboard/src/views/app.js
+++ b/dashboard/src/views/app.js
@@ -1433,7 +1433,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         provider: '',
         bucket: '',
         prefix: '',
-        mountPoint: '',
+        mountPoint: '', // for mountpoint
         accessKeyId: '',
         secretAccessKey: '',
         gcsKey: { keyFileName: '', content: '' },
@@ -1492,7 +1492,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             // only set provider specific fields, this will clear them in the db
             if ($scope.s3like(backupConfig.provider)) {
                 backupConfig.bucket = $scope.importBackup.bucket;
-                backupConfig.prefix = '';
+                backupConfig.prefix = $scope.importBackup.prefix;
                 backupConfig.accessKeyId = $scope.importBackup.accessKeyId;
                 backupConfig.secretAccessKey = $scope.importBackup.secretAccessKey;
 
@@ -1539,7 +1539,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 }
             } else if (backupConfig.provider === 'gcs') {
                 backupConfig.bucket = $scope.importBackup.bucket;
-                backupConfig.prefix = '';
+                backupConfig.prefix = $scope.importBackup.prefix;
                 try {
                     var serviceAccountKey = JSON.parse($scope.importBackup.gcsKey.content);
                     backupConfig.projectId = serviceAccountKey.project_id;
@@ -1559,9 +1559,9 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 }
             } else if (backupConfig.provider === 'sshfs' || backupConfig.provider === 'cifs' || backupConfig.provider === 'nfs' || backupConfig.provider === 'ext4' || backupConfig.provider === 'xfs') {
                 backupConfig.mountOptions = $scope.importBackup.mountOptions;
-                backupConfig.prefix = '';
+                backupConfig.prefix = $scope.importBackup.prefix;
             } else if (backupConfig.provider === 'mountpoint') {
-                backupConfig.prefix = '';
+                backupConfig.prefix = $scope.importBackup.prefix;
                 backupConfig.mountPoint = $scope.importBackup.mountPoint;
             } else if (backupConfig.provider === 'filesystem') {
                 var parts = remotePath.split('/');
@@ -2240,13 +2240,9 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             var backupConfig;
             try {
                 backupConfig = JSON.parse(result.target.result);
-                let prefix = backupConfig.prefix;
-                backupConfig.prefix = ''; // so it can clear the form as well when we apply keys below
-                if (backupConfig.provider === 'filesystem') { // patch the remotePath to have the full path
-                    backupConfig.remotePath = (prefix ? prefix + '/' : '') + backupConfig.backupFolder + '/' + backupConfig.remotePath;
+                if (backupConfig.provider === 'filesystem') { // this allows a user to upload a backup to server and import easily with an absolute path
+                    backupConfig.remotePath = backupConfig.backupFolder + '/' + backupConfig.remotePath;
                     delete backupConfig.backupFolder;
-                } else {
-                    backupConfig.remotePath = (prefix ? prefix + '/' : '') + backupConfig.remotePath;
                 }
             } catch (e) {
                 console.error('Unable to parse backup config');