diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 09c9781a9..028dc9e0b 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -116,27 +116,38 @@ function openvpn_xmlrpc_sync()
     return $result;
 }
 
-$openvpn_verbosity_level = array(
-    0 => gettext('0 (none)'),
-    1 => gettext('1 (default)'),
-    2 => gettext('2'),
-    3 => gettext('3 (recommended)'),
-    4 => gettext('4'),
-    5 => gettext('5'),
-    6 => gettext('6'),
-    7 => gettext('7'),
-    8 => gettext('8'),
-    9 => gettext('9'),
-    10 => gettext('10'),
-    11 => gettext('11'),
-);
+function openvpn_verbosity_level()
+{
+    return array(
+       0 => gettext('0 (none)'),
+       1 => gettext('1 (default)'),
+       2 => gettext('2'),
+       3 => gettext('3 (recommended)'),
+       4 => gettext('4'),
+       5 => gettext('5'),
+       6 => gettext('6'),
+       7 => gettext('7'),
+       8 => gettext('8'),
+       9 => gettext('9'),
+       10 => gettext('10'),
+       11 => gettext('11'),
+    );
+}
 
-$openvpn_compression_modes = array(
-    '' => gettext('No Preference'),
-    'no' => gettext('Disabled - No Compression'),
-    'adaptive' => gettext('Enabled with Adaptive Compression'),
-    'yes' => gettext('Enabled without Adaptive Compression'),
-);
+function openvpn_compression_modes()
+{
+    return array(
+        '' => gettext('No Preference'),
+        'no' => gettext('Disabled - No Compression'),
+        'adaptive' => gettext('Enabled with Adaptive Compression'),
+        'yes' => gettext('Enabled without Adaptive Compression'),
+    );
+}
+
+function openvpn_get_protocols()
+{
+    return array('UDP', 'UDP6', 'TCP', 'TCP6');
+}
 
 function openvpn_create_key()
 {
diff --git a/src/etc/inc/plugins.inc.d/openvpn/wizard.inc b/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
index 1980848ca..9248c23f7 100644
--- a/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
@@ -359,8 +359,7 @@ function step10_stepbeforeformdisplay()
     foreach ($pkg['step'][$stepid]['fields']['field'] as $idx => $field) {
         if ($field['name'] == "crypto") {
             $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
-            $cipherlist = openvpn_get_cipherlist();
-            foreach ($cipherlist as $name => $desc) {
+            foreach (openvpn_get_cipherlist() as $name => $desc) {
                 $opt = array();
                 $opt['name'] = $desc;
                 $opt['value'] = $name;
@@ -368,17 +367,15 @@ function step10_stepbeforeformdisplay()
             }
         } elseif ($field['name'] == "digest") {
             $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
-            $digestlist = openvpn_get_digestlist();
-            foreach ($digestlist as $name => $desc) {
+            foreach (openvpn_get_digestlist() as $name => $desc) {
                 $opt = array();
                 $opt['name'] = $desc;
                 $opt['value'] = $name;
                 $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
             }
         } elseif ($field['name'] == "compression") {
-            global $openvpn_compression_modes;
             $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
-            foreach ($openvpn_compression_modes as $name => $desc) {
+            foreach (openvpn_compression_modes() as $name => $desc) {
                 $opt = array();
                 $opt['name'] = $desc;
                 $opt['value'] = $name;
@@ -386,15 +383,14 @@ function step10_stepbeforeformdisplay()
             }
         } elseif ($field['name'] == "engine") {
             $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
-            $engines = openvpn_get_engines();
-            foreach ($engines as $name => $desc) {
+            foreach (openvpn_get_engines() as $name => $desc) {
                 $opt = array();
                 $opt['name'] = $desc;
                 $opt['value'] = $name;
                 $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
             }
         } elseif ($field['name'] == "nbttype") {
-              $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
+            $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
             foreach ($netbios_nodetypes as $type => $name) {
                 $opt = array();
                 $opt['name'] = $name;
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index b94ab466d..0807f4ac3 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -593,7 +593,7 @@ $( document ).ready(function() {
               <td>
                 <select name='protocol' class="form-control">
 <?php
-                foreach (array("UDP", "UDP6", "TCP", "TCP6") as $prot) :
+                foreach (openvpn_get_protocols() as $prot):
                     $selected = "";
                     if ($pconfig['protocol'] == $prot) {
                         $selected = "selected=\"selected\"";
@@ -1044,7 +1044,7 @@ $( document ).ready(function() {
             <td>
               <select name="compression" class="form-control">
                 <?php
-                                foreach ($openvpn_compression_modes as $cmode => $cmodedesc) :
+                                foreach (openvpn_compression_modes() as $cmode => $cmodedesc):
                                     $selected = "";
                                     if ($cmode == $pconfig['compression']) {
                                         $selected = " selected=\"selected\"";
@@ -1120,7 +1120,7 @@ $( document ).ready(function() {
               <td>
               <select name="verbosity_level" class="form-control">
               <?php
-                            foreach ($openvpn_verbosity_level as $verb_value => $verb_desc) :
+                            foreach (openvpn_verbosity_level() as $verb_value => $verb_desc):
                                 $selected = '';
                                 if ($pconfig['verbosity_level'] == $verb_value) {
                                     $selected = 'selected="selected"';
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 3863e2f25..e2b34158d 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -334,7 +334,7 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys
         } elseif (substr($expformat, 0, 6) != "inline") {
             $conf .= "pkcs12 {$prefix}.p12{$nl}";
         }
-    } else if ($settings['mode'] == "server_user") {
+    } elseif ($settings['mode'] == "server_user") {
         if (substr($expformat, 0, 6) != "inline") {
             $conf .= "ca {$cafile}{$nl}";
         }
@@ -783,7 +783,7 @@ function openvpn_client_export_build_remote_lines($settings, $useaddr, $interfac
                 $server_host = get_interface_ip($interface);
             }
         }
-    } else if ($useaddr == "serverhostname" || empty($useaddr)) {
+    } elseif ($useaddr == "serverhostname" || empty($useaddr)) {
         $server_host = empty($config['system']['hostname']) ? "" : "{$config['system']['hostname']}.";
         $server_host .= "{$config['system']['domain']}";
     } else {
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index a5cb2232e..a6afbfea5 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -691,7 +691,7 @@ $( document ).ready(function() {
                         <td>
                           <select name='protocol' class="form-control">
 <?php
-                          foreach (array("UDP", "UDP6", "TCP", "TCP6") as $prot) :
+                          foreach (openvpn_get_protocols() as $prot):
                               $selected = "";
                               if ($pconfig['protocol'] == $prot) {
                                   $selected = "selected=\"selected\"";
@@ -1240,7 +1240,7 @@ endif; ?>
                       <td>
                         <select name="compression" class="form-control">
 <?php
-                        foreach ($openvpn_compression_modes as $cmode => $cmodedesc) :
+                        foreach (openvpn_compression_modes() as $cmode => $cmodedesc):
                             $selected = "";
                             if ($cmode == $pconfig['compression']) {
                                 $selected = " selected=\"selected\"";
@@ -1537,7 +1537,7 @@ endif; ?>
                       <td>
                         <select name="verbosity_level" class="form-control">
 <?php
-                        foreach ($openvpn_verbosity_level as $verb_value => $verb_desc) :
+                        foreach (openvpn_verbosity_level() as $verb_value => $verb_desc):
                             $selected = '';
                             if ($pconfig['verbosity_level'] == $verb_value) {
                                 $selected = 'selected="selected"';