From 7274e1926bcc2b55a086b2800527f2ee822309df Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 16 Dec 2019 22:14:33 +0100
Subject: [PATCH] net-mgmt/zabbix-agent: post merge fixes, refs. #1618

---
 .../app/controllers/OPNsense/ZabbixAgent/forms/settings.xml  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
index 7e0423a80..8618b5378 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
@@ -137,21 +137,18 @@
             <label>PSK based encryption</label>
             <type>checkbox</type>
             <help>Enable PSK based encryption for communicating with the Zabbix server</help>
-            <advanced>true</advanced>
         </field>
         <field>
             <id>zabbixagent.settings.features.encryptionidentity</id>
             <label>PSK Identity</label>
             <type>text</type>
-            <help>>The PSK identity configured must match on agent and server</help>
-            <advanced>true</advanced>
+            <help>The PSK identity configured must match on agent and server</help>
         </field>
         <field>
             <id>zabbixagent.settings.features.encryptionpsk</id>
             <label>PSK</label>
             <type>text</type>
             <help>The PSK configured on the Zabbix server</help>
-            <advanced>true</advanced>
         </field>
     </tab>
 </form>