diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
index ab279f603..35659cc4f 100644
--- a/net/l2tp/Makefile
+++ b/net/l2tp/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		l2tp
 PLUGIN_VERSION=		1.7
+PLUGIN_REVISION=	1
 PLUGIN_DEPENDS=		clog mpd5
 PLUGIN_COMMENT=		L2TP server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/l2tp/src/www/vpn_l2tp.php b/net/l2tp/src/www/vpn_l2tp.php
index 05ffd0802..7cb56ac44 100644
--- a/net/l2tp/src/www/vpn_l2tp.php
+++ b/net/l2tp/src/www/vpn_l2tp.php
@@ -33,10 +33,8 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
-if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) {
-    $config['l2tp']['radius'] = array();
-}
-$l2tpcfg = &$config['l2tp'];
+$l2tpcfg = &config_read_array('l2tp');
+config_read_array('l2tp', 'radius');
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['remoteip'] = $l2tpcfg['remoteip'];
diff --git a/net/l2tp/src/www/vpn_l2tp_users.php b/net/l2tp/src/www/vpn_l2tp_users.php
index 2862ebac2..bde8ccd68 100644
--- a/net/l2tp/src/www/vpn_l2tp_users.php
+++ b/net/l2tp/src/www/vpn_l2tp_users.php
@@ -32,10 +32,7 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
-if (!isset($config['l2tp']['user'])) {
-    $config['l2tp']['user'] = array();
-}
-$a_secret = &$config['l2tp']['user'];
+$a_secret = &config_read_array('l2tp', 'user');
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     // delete entry
diff --git a/net/l2tp/src/www/vpn_l2tp_users_edit.php b/net/l2tp/src/www/vpn_l2tp_users_edit.php
index 783dcd214..a2ce5813b 100644
--- a/net/l2tp/src/www/vpn_l2tp_users_edit.php
+++ b/net/l2tp/src/www/vpn_l2tp_users_edit.php
@@ -48,10 +48,7 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("plugins.inc.d/if_l2tp.inc");
 
-if (empty($config['l2tp']['user']) || !is_array($config['l2tp']['user'])) {
-    $config['l2tp']['user'] = array();
-}
-$a_secret = &$config['l2tp']['user'];
+$a_secret = &config_read_array('l2tp', 'user');
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     if (isset($_GET['id']) && !empty($a_secret[$_GET['id']])) {