1 files changed, 8 insertions, 0 deletions
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html
index 1f9bcafb..5faff391 100644
--- a/modules-available/baseconfig/templates/_page.html
+++ b/modules-available/baseconfig/templates/_page.html
@@ -6,6 +6,9 @@
 <p>{{lang_clientRelatedConfig}}</p>
 <form action="?do=BaseConfig" method="post">
 	<input type="hidden" name="token" value="{{token}}">
+	{{#redirect}}
+	<input type="hidden" name="redirect" value="{{redirect}}">
+	{{/redirect}}
 	{{#override}}
 	<input name="module" type="hidden" value="{{target_module}}">
 	<input name="{{field}}" type="hidden" value="{{field_value}}">
@@ -110,15 +113,20 @@ document.addEventListener("DOMContentLoaded", function () {
 		var rules = $this.data('shadows');
 		if (!rules) return;
 		var currentValue = $this.val();
+		const disabled = [];
 		for (var triggerVal in rules) {
 			if (!rules.hasOwnProperty(triggerVal))
 				continue;
 			var targets = rules[triggerVal];
 			for (var i = 0; i < targets.length; ++i) {
 				var target = targets[i];
+				if (disabled.includes(target)) {
+					continue;
+				}
 				var inp = $('#' + target);
 				var selitem = inp.data('selitem');
 				if (currentValue === triggerVal) {
+					disabled.push(target);
 					inp.prop('disabled', true);
 					if (selitem) selitem.disable();
 					inp.filter('.multilist').multiselect('disable');