diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index ca895cb7e..64a2a070d 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -187,6 +187,12 @@ function openvpn_get_engines()
 {
 	$openssl_engines = array('none' => 'No Hardware Crypto Acceleration');
 	exec('/usr/local/bin/openssl engine -t -c', $openssl_engine_output);
+
+	if (!count($openssl_engine_output)) {
+		/* LibreSSL doesn't offer anything of value */
+		return $openssl_engines;
+	}
+
 	$openssl_engine_output = implode("\n", $openssl_engine_output);
 	$openssl_engine_output = preg_replace("/\\n\\s+/", "|", $openssl_engine_output);
 	$openssl_engine_output = explode("\n", $openssl_engine_output);
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index e787b5265..f5bae4f16 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -332,12 +332,12 @@
             </LogFile>
         </L2TP>
         <OpenVPN cssClass="fa fa-lock fa-fw" order="20">
-            <Server order="10" VisibleName="Server Settings" url="/vpn_openvpn_server.php">
+            <Servers order="10" url="/vpn_openvpn_server.php">
                 <Edit url="/vpn_openvpn_server.php?*" visibility="hidden"/>
-            </Server>
-            <Client order="20" VisibleName="Client Settings" url="/vpn_openvpn_client.php">
+            </Servers>
+            <Clients order="20" url="/vpn_openvpn_client.php">
                 <Edit url="/vpn_openvpn_client.php?*" visibility="hidden"/>
-            </Client>
+            </Clients>
             <CSC order="30" VisibleName="Client Specific Overrides" url="/vpn_openvpn_csc.php">
                 <Edit url="/vpn_openvpn_csc.php?*" visibility="hidden"/>
             </CSC>