diff --git a/src/views/app.html b/src/views/app.html
index 701bb0086..0390c4d55 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -185,10 +185,52 @@
             <input type="text" class="form-control" ng-model="importBackup.bucket" id="inputImportBackupBucket" name="bucket" ng-disabled="importBackup.busy" ng-required="s3like(importBackup.provider)">
           </div>
 
-          <!-- SSHFS/CIFS/NFS -->
-          <div class="form-group" ng-class="{ 'has-error': importBackup.error.mountPoint }" ng-show="mountlike(importBackup.provider)">
+          <!-- 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="mountlike(importBackup.provider)">
+            <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'">
+          </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'">
+          </div>
+
+           <!-- 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'">
+          </div>
+
+          <!-- 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">
+          </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">
+          </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'">
+          </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'">
+          </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>
           </div>
 
           <!-- Filesystem -->
diff --git a/src/views/app.js b/src/views/app.js
index 77339ab8d..4e4e71000 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -94,7 +94,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     $scope.storageProvider = [
         { name: 'Amazon S3', value: 's3' },
         { name: 'Backblaze B2 (S3 API)', value: 'backblaze-b2' },
-        // { name: 'CIFS Mount', value: 'cifs' },
+        { name: 'CIFS Mount', value: 'cifs' },
         { name: 'DigitalOcean Spaces', value: 'digitalocean-spaces' },
         { name: 'Exoscale SOS', value: 'exoscale-sos' },
         // { name: 'EXT4', value: 'ext4' },
@@ -104,11 +104,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         { name: 'IONOS (Profitbricks)', value: 'ionos-objectstorage' },
         { name: 'Linode Object Storage', value: 'linode-objectstorage' },
         { name: 'Minio', value: 'minio' },
-        // { name: 'NFS Mount', value: 'nfs' },
+        { name: 'NFS Mount', value: 'nfs' },
         { name: 'OVH Object Storage', value: 'ovh-objectstorage' },
         { name: 'S3 API Compatible (v4)', value: 's3-v4-compat' },
         { name: 'Scaleway Object Storage', value: 'scaleway-objectstorage' },
-        // { name: 'SSHFS Mount', value: 'sshfs' },
+        { name: 'SSHFS Mount', value: 'sshfs' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         // { name: 'No-op (Only for testing)', value: 'noop' },
         { name: 'Wasabi', value: 'wasabi' }
@@ -986,6 +986,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         format: 'tgz',
         backupId: '',
         password: '',
+        mountOptions: {},
 
         clearForm: function () {
             // $scope.importBackup.provider = ''; // do not clear since we call this function on provider change
@@ -1002,6 +1003,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.importBackup.acceptSelfSignedCerts = false;
             $scope.importBackup.password = '';
             $scope.importBackup.backupId = '';
+            $scope.importBackup.mountOptions = {};
         },
 
         submit: function () {
@@ -1076,7 +1078,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                     return;
                 }
             } else if (backupConfig.provider === 'sshfs' || backupConfig.provider === 'cifs' || backupConfig.provider === 'nfs') {
-                backupConfig.mountPoint = $scope.importBackup.mountPoint;
+                backupConfig.mountOptions = $scope.importBackup.mountOptions;
                 backupConfig.prefix = $scope.importBackup.prefix;
             } else if (backupConfig.provider === 'filesystem') {
                 var parts = backupId.split('/');
@@ -1646,6 +1648,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 return;
             }
 
+            console.log(backupConfig)
+
             $scope.$apply(function () {
                 // we assume property names match here, this does not yet work for gcs keys
                 Object.keys(backupConfig).forEach(function (k) {
diff --git a/src/views/backups.html b/src/views/backups.html
index 33b704afe..b7e8187f5 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -140,28 +140,28 @@
           <!-- CIFS/NFS/SSHFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs' || configureBackup.provider === 'nfs' || configureBackup.provider === 'sshfs'">
             <label class="control-label" for="configureBackupHost">{{ 'backups.configureBackupStorage.server' | tr }} ({{ configureBackup.provider }})</label>
-            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.host" id="configureBackupHost" name="host" ng-disabled="configureBackup.busy" placeholder="Server IP or hostname" ng-required="configureBackup.provider === 'cifs' || configureBackup.provider === 'nfs'">
+            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.host" id="configureBackupHost" name="host" ng-disabled="configureBackup.busy" placeholder="Server IP or hostname" ng-required="configureBackup.provider === 'cifs' || configureBackup.provider === 'nfs' || configureBackup.provider === 'sshfs'">
           </div>
 
-           <!-- CIFS/NFS/SSHFS -->
+          <!-- CIFS/NFS/SSHFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs' || configureBackup.provider === 'nfs' || configureBackup.provider === 'sshfs'">
             <label class="control-label" for="configureBackupRemoteDir">{{ 'backups.configureBackupStorage.remoteDirectory' | tr }} ({{ configureBackup.provider }})</label>
             <input type="text" class="form-control" ng-model="configureBackup.mountOptions.remoteDir" id="configureBackupRemoteDir" name="remoteDir" ng-disabled="configureBackup.busy" placeholder="/share" ng-required="configureBackup.provider === 'cifs' || configureBackup.provider === 'nfs' || configureBackup.provider === 'sshfs'">
           </div>
 
-           <!-- CIFS -->
+          <!-- CIFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs'">
             <label class="control-label" for="configureBackupUsername">{{ 'backups.configureBackupStorage.username' | tr }} ({{ configureBackup.provider }})</label>
             <input type="text" class="form-control" ng-model="configureBackup.mountOptions.username" id="configureBackupUsername" name="username" ng-disabled="configureBackup.busy">
           </div>
 
-           <!-- CIFS -->
+          <!-- CIFS -->
           <div class="form-group" ng-show="configureBackup.provider === 'cifs'">
             <label class="control-label" for="configureBackupPassword">{{ 'backups.configureBackupStorage.password' | tr }} ({{ configureBackup.provider }})</label>
             <input type="password" class="form-control" ng-model="configureBackup.mountOptions.password" id="configureBackupPassword" name="password" ng-disabled="configureBackup.busy">
           </div>
 
-           <!-- EXT4 -->
+          <!-- EXT4 -->
           <div class="form-group" ng-class="{ 'has-error': configureBackup.error.diskPath || !configureBackup.mountOptions.diskPath }" ng-show="configureBackup.provider === 'ext4'">
             <label class="control-label" for="inputConfigureDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
             <input type="text" class="form-control" ng-model="configureBackup.mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="configureBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="configureBackup.provider === 'ext4'">