diff --git a/templates/hostapd/advanced.php b/templates/hostapd/advanced.php
index d0559cfe..f7c9ee93 100644
--- a/templates/hostapd/advanced.php
+++ b/templates/hostapd/advanced.php
@@ -233,7 +233,7 @@
         <option value="OM">Oman</option>
         <option value="PK">Pakistan</option>
         <option value="PW">Palau</option>
-        <option value="PS">Palestinian Territory, Occupied</option>
+        <option value="PS">Palestinian Territory</option>
         <option value="PA">Panama</option>
         <option value="PG">Papua New Guinea</option>
         <option value="PY">Paraguay</option>
@@ -281,7 +281,7 @@
         <option value="SE">Sweden</option>
         <option value="CH">Switzerland</option>
         <option value="SY">Syrian Arab Republic</option>
-        <option value="TW">Taiwan, Province of China</option>
+        <option value="TW">Taiwan</option>
         <option value="TJ">Tajikistan</option>
         <option value="TZ">Tanzania, United Republic of</option>
         <option value="TH">Thailand</option>