diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 01dd5aece8..758c52ae85 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -25,3 +25,7 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
 #externalStorage td.status .success {
 	border-radius: 50%;
 }
+
+#userMountingBackends {
+	padding-left: 25px;
+}
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 00793a614c..348fecf064 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -310,19 +310,28 @@ $(document).ready(function() {
 		OC.msg.startSaving('#userMountingMsg');
 		if (this.checked) {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
-			$('#userMountingBackups').removeClass('hidden');
+			$('input[name="allowUserMountingBackends\\[\\]"]').prop('checked', true);
+			$('#userMountingBackends').removeClass('hidden');
+			$('input[name="allowUserMountingBackends\\[\\]"]').eq(0).trigger('change');
 		} else {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no');
-			$('#userMountingBackups').addClass('hidden');
+			$('#userMountingBackends').addClass('hidden');
 		}
 		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
 	});
 
 	$('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() {
 		OC.msg.startSaving('#userMountingMsg');
-		var user_mounting_backends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
-		OC.AppConfig.setValue('files_external', 'user_mounting_backends', user_mounting_backends.join());
+		var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
+		OC.AppConfig.setValue('files_external', 'user_mounting_backends', userMountingBackends.join());
 		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
+
+		// disable allowUserMounting
+		if(userMountingBackends.length === 0) {
+			$('#allowUserMounting').prop('checked', false);
+			$('#allowUserMounting').trigger('change');
+
+		}
 	});
 });
 
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index df80ed1099..98fcf4a0ed 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -131,7 +131,7 @@
 			value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
 		<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
-		<p id="userMountingBackups"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
+		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['personal_backends'] as $class => $backend): ?>
 				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($class); ?>" <?php if ($backend['enabled']) print_unescaped(' checked="checked"'); ?> />