diff --git a/hal-core/resource/resource/web/plugin_config.tmpl b/hal-core/resource/resource/web/plugin_config.tmpl
index 4c7ee9f8..92615cf3 100644
--- a/hal-core/resource/resource/web/plugin_config.tmpl
+++ b/hal-core/resource/resource/web/plugin_config.tmpl
@@ -2,7 +2,7 @@
-
Active plugins
+
Detected Plugins
diff --git a/hal-core/src/se/hal/page/PluginConfigWebPage.java b/hal-core/src/se/hal/page/PluginConfigWebPage.java
index e625a0c9..ae43771d 100644
--- a/hal-core/src/se/hal/page/PluginConfigWebPage.java
+++ b/hal-core/src/se/hal/page/PluginConfigWebPage.java
@@ -5,9 +5,11 @@ import se.hal.HalServer;
import se.hal.intf.HalAbstractController;
import se.hal.intf.HalAbstractControllerManager;
import se.hal.intf.HalWebPage;
+import zutil.ObjectUtil;
import zutil.io.file.FileUtil;
import zutil.parser.Templator;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -48,7 +50,14 @@ public class PluginConfigWebPage extends HalWebPage {
List controllers = new LinkedList<>();
for (HalAbstractControllerManager manager : HalServer.getControllerManagers()) {
- controllers.addAll(manager.getControllers());
+ Collection managerControllers = manager.getControllers();
+
+ if (!ObjectUtil.isEmpty(managerControllers)) {
+ for (HalAbstractController controller : managerControllers) {
+ if (!controllers.contains(controller))
+ controllers.add(controller);
+ }
+ }
}
Templator tmpl = new Templator(FileUtil.find(TEMPLATE));