diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 61db128474..0b9b70cdb3 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -166,9 +166,9 @@ $my_identifier_list = array('myaddress' => 'My IP address',
 				'dyn_dns' => 'Dynamic DNS');
 
 $p1_ealgos = array('des' => 'DES', '3des' => '3DES', 'blowfish' => 'Blowfish',
-		'cast128' => 'CAST128','rijndael' => 'Rijndael (AES)', 'rijndael 256' => 'Rijndael 256');
+		'cast128' => 'CAST128','rijndael' => 'Rijndael (AES)', 'aes 256' => 'AES-256');
 $p2_ealgos = array('des' => 'DES', '3des' => '3DES', 'blowfish' => 'Blowfish',
-		'cast128' => 'CAST128', 'rijndael' => 'Rijndael (AES)', 'rijndael 256' => 'Rijndael 256');
+		'cast128' => 'CAST128', 'rijndael' => 'Rijndael (AES)', 'aes 256' => 'AES-256');
 
 $p1_halgos = array('sha1' => 'SHA1', 'md5' => 'MD5');
 $p1_authentication_methods = array('pre_shared_key' => 'Pre-shared key', 'rsasig' => 'RSA signature');
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php
index 325203d7c4..98a1072df6 100755
--- a/usr/local/www/vpn_ipsec_edit.php
+++ b/usr/local/www/vpn_ipsec_edit.php
@@ -111,7 +111,7 @@ if (isset($id) && $a_ipsec[$id]) {
 	$pconfig['p1halgo'] = "sha1";
 	$pconfig['p1dhgroup'] = "2";
 	$pconfig['p2proto'] = "esp";
-	$pconfig['p2ealgos'] = explode(",", "3des,blowfish,cast128,rijndael,rijndael 256");
+	$pconfig['p2ealgos'] = explode(",", "3des,blowfish,cast128,rijndael,aes 256");
 	$pconfig['p2halgos'] = explode(",", "hmac_sha1,hmac_md5");
 	$pconfig['p2pfsgroup'] = "0";
 	$pconfig['remotebits'] = 32;
@@ -663,4 +663,4 @@ function address_to_pconfig_vpn($adr, &$padr, &$pmask) {
         }
 }
 
-?>
+?>
\ No newline at end of file