diff --git a/source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst b/source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
index a0a6604..bf829a5 100644
--- a/source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
+++ b/source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
@@ -55,42 +55,6 @@ function MiniApplySSID($ssid) {
 	setStr("Device.WiFi.Radio."+$apply_rf+".X_CISCO_COM_ApplySettingSSID", $apply_id, false);
 	setStr("Device.WiFi.Radio."+$apply_rf+".X_CISCO_COM_ApplySetting", "true", true);
 }
-// security_mode from encrypt_mode & encrypt_method
-function security_mode($encrypt_mode, $encrypt_method) {
-	$security = "None";
-	if ("WEP-64" == $encrypt_mode){
-		$security = "WEP_64";
-	}
-	else if ("WEP-128" == $encrypt_mode){
-		$security = "WEP_128";
-	}
-	else if ("WPA-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA_PSK_TKIP";
-		}
-		else{
-			$security = "WPA_PSK_AES";
-		}
-	}
-	else if ("WPA2-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA2_PSK_TKIP";
-		}
-		else if ("AES" == $encrypt_method){
-			$security = "WPA2_PSK_AES";
-		}
-		else{
-			$security = "WPA2_PSK_TKIPAES";
-		}
-	}
-	else if ("WPA-WPA2-Personal" == $encrypt_mode){
-		$security = "WPAWPA2_PSK_TKIPAES";
-	}
-	else{
-		$security = "None";
-	}
-	return $security;
-}
 $response_message = '';
 //ssid 1,2 for all
 //ssid 3,4 for mso only
diff --git a/source/Styles/xb3/jst/includes/actionHandlerUtility.jst b/source/Styles/xb3/jst/includes/actionHandlerUtility.jst
index 3b9c07b..cee771e 100644
--- a/source/Styles/xb3/jst/includes/actionHandlerUtility.jst
+++ b/source/Styles/xb3/jst/includes/actionHandlerUtility.jst
@@ -359,4 +359,59 @@ function voiceDML(){
 	return $voiceDML;
 }
 $tvdml = voiceDML();
+
+// $security_mode from $encrypt_mode & $encrypt_method
+function security_mode($encrypt_mode, $encrypt_method) {
+	$security = "None";
+	if ("WEP-64" == $encrypt_mode){
+		$security = "WEP_64";
+	}
+	else if ("WEP-128" == $encrypt_mode){
+		$security = "WEP_128";
+	}
+	else if ("WPA-Personal" == $encrypt_mode){
+		if ("TKIP" == $encrypt_method){
+			$security = "WPA_PSK_TKIP";
+		}
+		else {
+			$security = "WPA_PSK_AES";
+		}
+	}
+	else if ("WPA2-Personal" == $encrypt_mode){
+		if ("TKIP" == $encrypt_method){
+			$security = "WPA2_PSK_TKIP";
+		}
+		else if ("AES" == $encrypt_method){
+			$security = "WPA2_PSK_AES";
+		}
+		else {
+			$security = "WPA2_PSK_TKIPAES";
+		}
+	}
+	else if ("WPA-WPA2-Personal" == $encrypt_mode){
+		$security = "WPAWPA2_PSK_TKIPAES";
+	}
+	else if ("WPA3-Personal" == $encrypt_mode){
+		if ("AES" == $encrypt_method)
+			$security = "WPA3-Personal Only";
+		else if("AES+GCMP" == $encrypt_method)
+			$security = "WPA3-Personal Only AES_GCMP";
+	}
+	else if ("WPA3-Personal-Transition" == $encrypt_mode){
+		if ("AES" == $encrypt_method)
+			$security = "WPA3-Personal Transition";
+		else if("AES+GCMP" == $encrypt_method)
+			$security = "WPA3-Personal Transition AES_GCMP";
+	}
+	else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
+		if ("AES" == $encrypt_method)
+			$security = "WPA3-Personal Compatibility";
+		else if("AES+GCMP" == $encrypt_method)
+			$security = "WPA3-Personal Compatibility AES_GCMP";
+	}
+	else {
+		$security = "None";
+	}
+	return $security;
+}
 ?>
diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst
index 5ccbefe..0ff48e8 100644
--- a/source/Styles/xb3/jst/includes/utility.jst
+++ b/source/Styles/xb3/jst/includes/utility.jst
@@ -91,36 +91,84 @@ function KeyExtGet($root, $param)
 //return a string of encryption type
 function encrypt_map($mode, $method)
 {
-	$method = str_replace("AES+TKIP", "TKIP/AES", $method);
+	if ($method == "AES+TKIP") {
+		$method = "TKIP/AES";
+	} else if ($method == "AES+GCMP") {
+		$method = "GCMP/AES";
+	}
 	switch ($mode)
 	{
-	case "None":
-		return "Open (risky)";
-	case "WEP-64":
-		return "WEP 64 (risky)";
-	case "WEP-128":
-		return "WEP 128 (risky)";
-	case "WPA-Personal":
-		return "WPA-PSK ("+$method+")"; 
-	case "WPA2-Personal":
-		return "WPA2-PSK ("+$method+")"; 
-	case "WPA-WPA2-Personal":
-		return "WPAWPA2-PSK ("+$method+")"; 
-	case "WPA-Enterprise":
-		return "WPA ("+$method+")"; 
-	case "WPA2-Enterprise":
-		return "WPA2 ("+$method+")"; 
-	case "WPA-WPA2-Enterprise":
-		return "WPAWPA2 ("+$method+")"; 
-	case "WPA3-Personal":
-		return "WPA3-Personal Only";
-	case "WPA3-Personal-Transition":
-                return "WPA3-Personal Transition";
-        case "WPA3-Personal-Compatibility":
-                return "WPA3-Personal Compatibility";
-	default:
-		return "WPAWPA2-PSK (TKIP/AES)";
+		case "None":
+			return "Open (risky)";
+		case "WEP-64":
+			return "WEP 64 (risky)";
+		case "WEP-128":
+			return "WEP 128 (risky)";
+		case "WPA-Personal":
+			return "WPA-PSK ("+$method+")";
+		case "WPA2-Personal":
+			return "WPA2-PSK ("+$method+")";
+		case "WPA-WPA2-Personal":
+			return "WPAWPA2-PSK ("+$method+")";
+		case "WPA-Enterprise":
+			return "WPA ("+$method+")";
+		case "WPA2-Enterprise":
+			return "WPA2 ("+$method+")";
+		case "WPA-WPA2-Enterprise":
+			return "WPAWPA2 ("+$method+")";
+		case "WPA3-Personal":
+			return "WPA3-Personal Only";
+		case "WPA3-Personal-Transition":
+			return "WPA3-Personal Transition";
+		case "WPA3-Personal-Compatibility":
+			return "WPA3-Personal Compatibility";
+		default:
+			return "WPAWPA2-PSK (TKIP/AES)";
+	}
+}
+
+// return internal security mode value used by edit-page <select> options
+function security_mode_map($encrypt_mode, $encrypt_method)
+{
+	$security = "None";
+	if ("WEP-64" == $encrypt_mode){
+		$security = "WEP_64";
+	}
+	else if ("WEP-128" == $encrypt_mode){
+		$security = "WEP_128";
+	}
+	else if ("WPA-Personal" == $encrypt_mode){
+		if ("TKIP" == $encrypt_method){
+			$security = "WPA_PSK_TKIP";
+		}
+		else {
+			$security = "WPA_PSK_AES";
+		}
+	}
+	else if ("WPA2-Personal" == $encrypt_mode){
+		if ("TKIP" == $encrypt_method){
+			$security = "WPA2_PSK_TKIP";
+		}
+		else if ("AES" == $encrypt_method){
+			$security = "WPA2_PSK_AES";
+		}
+		else {
+			$security = "WPA2_PSK_TKIPAES";
+		}
+	}
+	else if ("WPA-WPA2-Personal" == $encrypt_mode){
+		$security = "WPAWPA2_PSK_TKIPAES";
+	}
+	else if ("WPA3-Personal" == $encrypt_mode){
+		$security = "WPA3-Personal Only";
+	}
+	else if ("WPA3-Personal-Transition" == $encrypt_mode){
+		$security = "WPA3-Personal Transition";
+	}
+	else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
+		$security = "WPA3-Personal Compatibility";
 	}
+	return $security;
 }
 /**
  * Discription: 
diff --git a/source/Styles/xb3/jst/wireless_network_configuration_edit.jst b/source/Styles/xb3/jst/wireless_network_configuration_edit.jst
index c0410a5..bbf58a2 100644
--- a/source/Styles/xb3/jst/wireless_network_configuration_edit.jst
+++ b/source/Styles/xb3/jst/wireless_network_configuration_edit.jst
@@ -157,40 +157,8 @@ if ("false" == $wifi_value['Radio_'+$rf+'_Enable']){
 $supported_mode		= $wifi_value['SupportedStandards'];
 if ("1-11"==$possible_channels)
 $possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
-$security = "None";
-if ("WEP-64" == $encrypt_mode){
-		$security = "WEP_64";
-		$network_password = $network_pass_64;
-}
-else if ("WEP-128" == $encrypt_mode){
-		$security = "WEP_128";
-		$network_password = $network_pass_128;
-}
-else if ("WPA-Personal" == $encrypt_mode){
-	if ("TKIP" == $encrypt_method){
-		$security = "WPA_PSK_TKIP";
-	}
-	else{
-		$security = "WPA_PSK_AES";
-	}
-}
-else if ("WPA2-Personal" == $encrypt_mode){
-	if ("TKIP" == $encrypt_method){
-		$security = "WPA2_PSK_TKIP";
-	}
-	else if ("AES" == $encrypt_method){
-		$security = "WPA2_PSK_AES";
-	}
-	else{
-		$security = "WPA2_PSK_TKIPAES";
-	}
-}
-else if ("WPA-WPA2-Personal" == $encrypt_mode){
-		$security = "WPAWPA2_PSK_TKIPAES";
-}
-else{
-		$security = "None";
-}
+$security = security_mode_map($encrypt_mode, $encrypt_method);
+
 //for SSID 1 and 2 don't show password for mso user
 $password_mso_user = !(($id == 1 || $id == 2) && ($_SESSION["loginuser"] == "mso"));
 ?>
diff --git a/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst b/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
index 671ac52..e71a98a 100644
--- a/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
+++ b/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
@@ -71,51 +71,6 @@ $get_encrypt_mode	= getStr("Device.WiFi.AccessPoint."+$i+".Security.ModeEnabled"
 $get_encrypt_method	= getStr("Device.WiFi.AccessPoint."+$i+".Security.X_CISCO_COM_EncryptionMethod");
 $WifiPersonalizationEnable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_WiFiNeedsPersonalization");
 
-// security_mode from $encrypt_mode & $encrypt_method
-function security_mode($encrypt_mode, $encrypt_method) {
-	$security = "None";
-	if ("WEP-64" == $encrypt_mode){
-		$security = "WEP_64";
-	}
-	else if ("WEP-128" == $encrypt_mode){
-		$security = "WEP_128";
-	}
-	else if ("WPA-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA_PSK_TKIP";
-		}
-		else {
-			$security = "WPA_PSK_AES";
-		}
-	}
-	else if ("WPA2-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA2_PSK_TKIP";
-		}
-		else if ("AES" == $encrypt_method){
-			$security = "WPA2_PSK_AES";
-		}
-		else {
-			$security = "WPA2_PSK_TKIPAES";
-		}
-	}
-	else if ("WPA-WPA2-Personal" == $encrypt_mode){
-		$security = "WPAWPA2_PSK_TKIPAES";
-	}
-	else if ("WPA3-Personal" == $encrypt_mode){
-		if ("AES" == $encrypt_method)
-			$security = "WPA3-Personal Only";
-	}
-	else if ("WPA3-Personal-Transition" == $encrypt_mode){
-		if ("AES" == $encrypt_method)
-			$security = "WPA3-Personal Transition";
-	}
-	else {
-		$security = "None";
-	}
-	return $security;
-}
-
 if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
 if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
 $response_message = '';
diff --git a/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst b/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst
index 48bed5f..59856ff 100644
--- a/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst
+++ b/source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst
@@ -71,55 +71,6 @@ $get_encrypt_mode	= getStr("Device.WiFi.AccessPoint."+$i+".Security.ModeEnabled"
 $get_encrypt_method	= getStr("Device.WiFi.AccessPoint."+$i+".Security.X_CISCO_COM_EncryptionMethod");
 $WifiPersonalizationEnable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_WiFiNeedsPersonalization");
 
-// security_mode from $encrypt_mode & $encrypt_method
-function security_mode($encrypt_mode, $encrypt_method) {
-	$security = "None";
-	if ("WEP-64" == $encrypt_mode){
-		$security = "WEP_64";
-	}
-	else if ("WEP-128" == $encrypt_mode){
-		$security = "WEP_128";
-	}
-	else if ("WPA-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA_PSK_TKIP";
-		}
-		else {
-			$security = "WPA_PSK_AES";
-		}
-	}
-	else if ("WPA2-Personal" == $encrypt_mode){
-		if ("TKIP" == $encrypt_method){
-			$security = "WPA2_PSK_TKIP";
-		}
-		else if ("AES" == $encrypt_method){
-			$security = "WPA2_PSK_AES";
-		}
-		else {
-			$security = "WPA2_PSK_TKIPAES";
-		}
-	}
-	else if ("WPA-WPA2-Personal" == $encrypt_mode){
-		$security = "WPAWPA2_PSK_TKIPAES";
-	}
-	else if ("WPA3-Personal" == $encrypt_mode){
-		if ("AES" == $encrypt_method)
-			$security = "WPA3-Personal Only";
-	}
-	else if ("WPA3-Personal-Transition" == $encrypt_mode){
-		if ("AES" == $encrypt_method)
-			$security = "WPA3-Personal Transition";
-	}
-        else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
-                if ("AES" == $encrypt_method)
-                        $security = "WPA3-Personal Compatibility";
-        }
-	else {
-		$security = "None";
-	}
-	return $security;
-}
-
 if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
 if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
 $response_message = '';
diff --git a/source/Styles/xb6/jst/wireless_network_configuration_edit.jst b/source/Styles/xb6/jst/wireless_network_configuration_edit.jst
index a57b84e..9b116c4 100644
--- a/source/Styles/xb6/jst/wireless_network_configuration_edit.jst
+++ b/source/Styles/xb6/jst/wireless_network_configuration_edit.jst
@@ -158,7 +158,7 @@ if($id != 1 && $id != 2 && $id != 17) $Mesh_Mode = 'false';
 if(strstr($_SESSION["lanMode"], "bridge-static") ) {
 	if($_SESSION["loginuser"] != "mso")
 	{
-        	if($OperatingChannelBandwidth == "6GHz")
+		if($OperatingChannelBandwidth == "6GHz")
         	array_remove($valid_ids,4);
 		array_remove($valid_ids,3);
 		array_remove($valid_ids,2);
@@ -167,7 +167,7 @@ if(strstr($_SESSION["lanMode"], "bridge-static") ) {
 	}
 	else
 	{
-        	if($OperatingChannelBandwidth == "6GHz")
+		if($OperatingChannelBandwidth == "6GHz")
         	array_remove($valid_ids,4);
 		array_remove($valid_ids,1);
 		array_remove($valid_ids,0);
@@ -188,24 +188,7 @@ $supported_mode         = $wifi_value['SupportedStandards'];
 
 if ("1-11"==$possible_channels)
 $possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
-$security = "None";
-if ("WPA2-Personal" == $encrypt_mode){
-	if ("TKIP" == $encrypt_method){
-		$security = "WPA2_PSK_TKIP";
-	}
-	else if ("AES" == $encrypt_method){
-		$security = "WPA2_PSK_AES";
-	}
-}else if ("WPA3-Personal" == $encrypt_mode){
-    if ("AES" == $encrypt_method)
-        	$security = "WPA3-Personal Only";
-}else if ("WPA3-Personal-Transition" == $encrypt_mode){
-    if ("AES" == $encrypt_method)
-        $security = "WPA3-Personal Transition";
-}
-else{
-                $security = "None";
-}
+$security = security_mode_map($encrypt_mode, $encrypt_method);
 
 //for SSID 1 and 2 don't show password for mso user
 $password_mso_user = !(($id == 1 || $id == 2 || $id == 17) && ($_SESSION["loginuser"] == "mso"));
diff --git a/source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst b/source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst
index accbbfd..291c3db 100644
--- a/source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst
+++ b/source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst
@@ -198,27 +198,7 @@ $supported_mode         = getStr("Device.WiFi.Radio."+$rf+".SupportedStandards")
 
 if ("1-11"==$possible_channels)
 $possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
-$security = "None";
-if ("WPA2-Personal" == $encrypt_mode){
-	if ("TKIP" == $encrypt_method){
-		$security = "WPA2_PSK_TKIP";
-	}
-	else if ("AES" == $encrypt_method){
-		$security = "WPA2_PSK_AES";
-	}
-}else if ("WPA3-Personal" == $encrypt_mode){
-    if ("AES" == $encrypt_method)
-        	$security = "WPA3-Personal Only";
-}else if ("WPA3-Personal-Transition" == $encrypt_mode){
-    if ("AES" == $encrypt_method)
-        $security = "WPA3-Personal Transition";
-}else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
-    if ("AES" == $encrypt_method)
-        $security = "WPA3-Personal Compatibility";
-}
-else{
-                $security = "None";
-}
+$security = security_mode_map($encrypt_mode, $encrypt_method);
 
 //for SSID 1 and 2 don't show password for mso user
 $password_mso_user = !(($id == 1 || $id == 2 || $id == 17) && ($_SESSION["loginuser"] == "mso"));