diff --git a/includes/functions.php b/includes/functions.php
index d8ba6f18..0b7fad17 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -881,12 +881,12 @@ function getCountryCodes($locale = 'en', $flag = true) {
         if (count($parts) >= 2) {
             $countryCode = $parts[0];
             if ($flag) {
-                $countryFlag = $parts[3] . ' ';
-                $countryName = $parts[4];
+                $countryFlag = $parts[3];
+                $countryName = $parts[4] .' ';
             } else {
                 $countryName = $parts[3];
             }
-            $countryData[$countryCode] = $countryFlag .$countryName;
+            $countryData[$countryCode] = $countryName.$countryFlag;
         }
     }
     return $countryData;
diff --git a/includes/hostapd.php b/includes/hostapd.php
index 1cce5bf4..f0f343b9 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -117,7 +117,6 @@ function DisplayHostAPDConfig()
         }
     }
 
-    $countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2;
     $selectedHwMode = $arrConfig['hw_mode'];
     if (isset($arrConfig['ieee80211n'])) {
         if (strval($arrConfig['ieee80211n']) === '1') {
@@ -134,14 +133,6 @@ function DisplayHostAPDConfig()
             $selectedHwMode = 'w';
         }
     }
-    if (!in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) {
-        $hwModeDisabled = 'ac';
-        if ($selectedHwMode === $hwModeDisabled) {
-            unset($selectedHwMode);
-        }
-    } else {
-        $hwModeDisabled = null;
-    }
 
     echo renderTemplate(
         "hostapd", compact(
@@ -160,7 +151,6 @@ function DisplayHostAPDConfig()
             "arrHostapdConf",
             "operatingSystem",
             "selectedHwMode",
-            "hwModeDisabled",
             "countryCodes"
         )
     );