diff --git a/includes/hostapd.php b/includes/hostapd.php
index 9d15a906..3b450996 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -511,19 +511,7 @@ function updateHostapdConfig($ignore_broadcast_ssid,$wifiAPEnable,$bridgedEnable
         $config.= 'max_num_sta='.$_POST['max_num_sta'].PHP_EOL;
     }
 
-    // Parse optional /etc/hostapd/hostapd.conf.users file
-    if (file_exists(RASPI_HOSTAPD_CONFIG . '.users')) {
-        exec('cat '. RASPI_HOSTAPD_CONFIG . '.users', $hostapdconfigusers);
-        foreach ($hostapdconfigusers as $hostapdconfigusersline) {
-            if (strlen($hostapdconfigusersline) === 0) {
-                continue;
-            }
-            if ($hostapdconfigusersline[0] != "#") {
-                $arrLine = explode("=", $hostapdconfigusersline);
-                $config.= $arrLine[0]."=".$arrLine[1].PHP_EOL;;
-            }
-        }
-    }
+    $config.= parseUserHostapdCfg();
 
     file_put_contents("/tmp/hostapddata", $config);
     system("sudo cp /tmp/hostapddata " . RASPI_HOSTAPD_CONFIG, $result);
@@ -545,3 +533,25 @@ function iwRegSet(string $country_code, $status)
     return $result;
 }
 
+/**
+ * Parses optional /etc/hostapd/hostapd.conf.users file
+ *
+ * @return string $tmp
+ */
+function parseUserHostapdCfg()
+{
+    if (file_exists(RASPI_HOSTAPD_CONFIG . '.users')) {
+        exec('cat '. RASPI_HOSTAPD_CONFIG . '.users', $hostapdconfigusers);
+        foreach ($hostapdconfigusers as $hostapdconfigusersline) {
+            if (strlen($hostapdconfigusersline) === 0) {
+                continue;
+            }
+            if ($hostapdconfigusersline[0] != "#") {
+                $arrLine = explode("=", $hostapdconfigusersline);
+                $tmp.= $arrLine[0]."=".$arrLine[1].PHP_EOL;;
+            }
+        }
+        return $tmp;
+    }
+}
+