diff --git a/doc/language_issues.de b/doc/language_issues.de
index 48d7f6a1c..b9f774758 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -205,8 +205,6 @@ WARNING: translation string unused: extrahd
 WARNING: translation string unused: extrahd unable to read
 WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
-WARNING: translation string unused: firewall graphs
-WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firmware
 WARNING: translation string unused: firmware upload
 WARNING: translation string unused: force update
diff --git a/doc/language_issues.en b/doc/language_issues.en
index f2b6eb7b4..f2f6ab7d3 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -228,8 +228,6 @@ WARNING: translation string unused: extrahd
 WARNING: translation string unused: extrahd unable to read
 WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
-WARNING: translation string unused: firewall graphs
-WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firmware
 WARNING: translation string unused: firmware upload
 WARNING: translation string unused: force update
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 09dae68d4..b0a3adbca 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -766,6 +766,12 @@ WARNING: untranslated string: fireinfo why descr2
 WARNING: untranslated string: fireinfo why enable
 WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
@@ -1158,25 +1164,34 @@ WARNING: untranslated string: vpn weak
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
 WARNING: untranslated string: wlan client bssid
 WARNING: untranslated string: wlan client ccmp
 WARNING: untranslated string: wlan client configuration
 WARNING: untranslated string: wlan client disconnected
 WARNING: untranslated string: wlan client duplicate ssid
+WARNING: untranslated string: wlan client eap authentication method
 WARNING: untranslated string: wlan client edit entry
 WARNING: untranslated string: wlan client encryption
+WARNING: untranslated string: wlan client encryption eap
 WARNING: untranslated string: wlan client encryption none
 WARNING: untranslated string: wlan client encryption wep
 WARNING: untranslated string: wlan client encryption wpa
 WARNING: untranslated string: wlan client encryption wpa2
 WARNING: untranslated string: wlan client group cipher
 WARNING: untranslated string: wlan client group key algorithm
+WARNING: untranslated string: wlan client identity
 WARNING: untranslated string: wlan client invalid key length
 WARNING: untranslated string: wlan client new entry
 WARNING: untranslated string: wlan client new network
 WARNING: untranslated string: wlan client pairwise cipher
 WARNING: untranslated string: wlan client pairwise key algorithm
 WARNING: untranslated string: wlan client pairwise key group key
+WARNING: untranslated string: wlan client password
 WARNING: untranslated string: wlan client psk
 WARNING: untranslated string: wlan client ssid
 WARNING: untranslated string: wlan client tkip
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1f4f9c357..0407d0e57 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -776,6 +776,12 @@ WARNING: untranslated string: fireinfo why descr2
 WARNING: untranslated string: fireinfo why enable
 WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
@@ -1175,25 +1181,34 @@ WARNING: untranslated string: vpn weak
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
 WARNING: untranslated string: wlan client bssid
 WARNING: untranslated string: wlan client ccmp
 WARNING: untranslated string: wlan client configuration
 WARNING: untranslated string: wlan client disconnected
 WARNING: untranslated string: wlan client duplicate ssid
+WARNING: untranslated string: wlan client eap authentication method
 WARNING: untranslated string: wlan client edit entry
 WARNING: untranslated string: wlan client encryption
+WARNING: untranslated string: wlan client encryption eap
 WARNING: untranslated string: wlan client encryption none
 WARNING: untranslated string: wlan client encryption wep
 WARNING: untranslated string: wlan client encryption wpa
 WARNING: untranslated string: wlan client encryption wpa2
 WARNING: untranslated string: wlan client group cipher
 WARNING: untranslated string: wlan client group key algorithm
+WARNING: untranslated string: wlan client identity
 WARNING: untranslated string: wlan client invalid key length
 WARNING: untranslated string: wlan client new entry
 WARNING: untranslated string: wlan client new network
 WARNING: untranslated string: wlan client pairwise cipher
 WARNING: untranslated string: wlan client pairwise key algorithm
 WARNING: untranslated string: wlan client pairwise key group key
+WARNING: untranslated string: wlan client password
 WARNING: untranslated string: wlan client psk
 WARNING: untranslated string: wlan client ssid
 WARNING: untranslated string: wlan client tkip
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 6b5639c0f..8964ff9ef 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -731,6 +731,12 @@ WARNING: untranslated string: email settings
 WARNING: untranslated string: email testmail
 WARNING: untranslated string: email tls
 WARNING: untranslated string: email usemail
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw limitconcon
@@ -830,3 +836,12 @@ WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
 WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: vpn weak
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
+WARNING: untranslated string: wlan client eap authentication method
+WARNING: untranslated string: wlan client encryption eap
+WARNING: untranslated string: wlan client identity
+WARNING: untranslated string: wlan client password
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 30744829d..b9f935c74 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -743,6 +743,12 @@ WARNING: untranslated string: email settings
 WARNING: untranslated string: email testmail
 WARNING: untranslated string: email tls
 WARNING: untranslated string: email usemail
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err ratecon
@@ -878,3 +884,12 @@ WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
 WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: vpn weak
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
+WARNING: untranslated string: wlan client eap authentication method
+WARNING: untranslated string: wlan client encryption eap
+WARNING: untranslated string: wlan client identity
+WARNING: untranslated string: wlan client password
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 09dae68d4..b0a3adbca 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -766,6 +766,12 @@ WARNING: untranslated string: fireinfo why descr2
 WARNING: untranslated string: fireinfo why enable
 WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
@@ -1158,25 +1164,34 @@ WARNING: untranslated string: vpn weak
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
 WARNING: untranslated string: wlan client bssid
 WARNING: untranslated string: wlan client ccmp
 WARNING: untranslated string: wlan client configuration
 WARNING: untranslated string: wlan client disconnected
 WARNING: untranslated string: wlan client duplicate ssid
+WARNING: untranslated string: wlan client eap authentication method
 WARNING: untranslated string: wlan client edit entry
 WARNING: untranslated string: wlan client encryption
+WARNING: untranslated string: wlan client encryption eap
 WARNING: untranslated string: wlan client encryption none
 WARNING: untranslated string: wlan client encryption wep
 WARNING: untranslated string: wlan client encryption wpa
 WARNING: untranslated string: wlan client encryption wpa2
 WARNING: untranslated string: wlan client group cipher
 WARNING: untranslated string: wlan client group key algorithm
+WARNING: untranslated string: wlan client identity
 WARNING: untranslated string: wlan client invalid key length
 WARNING: untranslated string: wlan client new entry
 WARNING: untranslated string: wlan client new network
 WARNING: untranslated string: wlan client pairwise cipher
 WARNING: untranslated string: wlan client pairwise key algorithm
 WARNING: untranslated string: wlan client pairwise key group key
+WARNING: untranslated string: wlan client password
 WARNING: untranslated string: wlan client psk
 WARNING: untranslated string: wlan client ssid
 WARNING: untranslated string: wlan client tkip
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index f4944db94..83c2170fb 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -760,6 +760,12 @@ WARNING: untranslated string: extrahd maybe the device is in use
 WARNING: untranslated string: extrahd to
 WARNING: untranslated string: extrahd to root
 WARNING: untranslated string: extrahd you cant mount
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
@@ -1153,25 +1159,34 @@ WARNING: untranslated string: vpn weak
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
 WARNING: untranslated string: wlan client bssid
 WARNING: untranslated string: wlan client ccmp
 WARNING: untranslated string: wlan client configuration
 WARNING: untranslated string: wlan client disconnected
 WARNING: untranslated string: wlan client duplicate ssid
+WARNING: untranslated string: wlan client eap authentication method
 WARNING: untranslated string: wlan client edit entry
 WARNING: untranslated string: wlan client encryption
+WARNING: untranslated string: wlan client encryption eap
 WARNING: untranslated string: wlan client encryption none
 WARNING: untranslated string: wlan client encryption wep
 WARNING: untranslated string: wlan client encryption wpa
 WARNING: untranslated string: wlan client encryption wpa2
 WARNING: untranslated string: wlan client group cipher
 WARNING: untranslated string: wlan client group key algorithm
+WARNING: untranslated string: wlan client identity
 WARNING: untranslated string: wlan client invalid key length
 WARNING: untranslated string: wlan client new entry
 WARNING: untranslated string: wlan client new network
 WARNING: untranslated string: wlan client pairwise cipher
 WARNING: untranslated string: wlan client pairwise key algorithm
 WARNING: untranslated string: wlan client pairwise key group key
+WARNING: untranslated string: wlan client password
 WARNING: untranslated string: wlan client psk
 WARNING: untranslated string: wlan client ssid
 WARNING: untranslated string: wlan client tkip
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ac7a82dc1..e268462c8 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -707,6 +707,12 @@ WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: application layer gateways
 WARNING: untranslated string: bytes
 WARNING: untranslated string: dnssec disabled warning
+WARNING: untranslated string: firewall graph country
+WARNING: untranslated string: firewall graph ip
+WARNING: untranslated string: firewall graph port
+WARNING: untranslated string: firewall log country
+WARNING: untranslated string: firewall log ip
+WARNING: untranslated string: firewall log port
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian
@@ -761,3 +767,12 @@ WARNING: untranslated string: vpn start action route
 WARNING: untranslated string: vpn start action start
 WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: vpn weak
+WARNING: untranslated string: wlan client anonymous identity
+WARNING: untranslated string: wlan client auth auto
+WARNING: untranslated string: wlan client auth peap
+WARNING: untranslated string: wlan client auth ttls
+WARNING: untranslated string: wlan client authentication settings
+WARNING: untranslated string: wlan client eap authentication method
+WARNING: untranslated string: wlan client encryption eap
+WARNING: untranslated string: wlan client identity
+WARNING: untranslated string: wlan client password
diff --git a/doc/language_missings b/doc/language_missings
index 72fe07594..a2f2fed9a 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -161,6 +161,12 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
+< firewall graph country
+< firewall graph ip
+< firewall graph port
+< firewall log country
+< firewall log ip
+< firewall log port
 < firewall logs country
 < firewall rules
 < first
@@ -595,25 +601,34 @@
 < wlan client
 < wlan client advanced settings
 < wlan client and
+< wlan client anonymous identity
+< wlan client auth auto
+< wlan client authentication settings
+< wlan client auth peap
+< wlan client auth ttls
 < wlan client bssid
 < wlan client ccmp
 < wlan client configuration
 < wlan client disconnected
 < wlan client duplicate ssid
+< wlan client eap authentication method
 < wlan client edit entry
 < wlan client encryption
+< wlan client encryption eap
 < wlan client encryption none
 < wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client group cipher
 < wlan client group key algorithm
+< wlan client identity
 < wlan client invalid key length
 < wlan client new entry
 < wlan client new network
 < wlan client pairwise cipher
 < wlan client pairwise key algorithm
 < wlan client pairwise key group key
+< wlan client password
 < wlan client psk
 < wlan clients
 < wlan client ssid
@@ -780,6 +795,12 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
+< firewall graph country
+< firewall graph ip
+< firewall graph port
+< firewall log country
+< firewall log ip
+< firewall log port
 < firewall logs country
 < firewall rules
 < first
@@ -1197,25 +1218,34 @@
 < wlan client
 < wlan client advanced settings
 < wlan client and
+< wlan client anonymous identity
+< wlan client auth auto
+< wlan client authentication settings
+< wlan client auth peap
+< wlan client auth ttls
 < wlan client bssid
 < wlan client ccmp
 < wlan client configuration
 < wlan client disconnected
 < wlan client duplicate ssid
+< wlan client eap authentication method
 < wlan client edit entry
 < wlan client encryption
+< wlan client encryption eap
 < wlan client encryption none
 < wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client group cipher
 < wlan client group key algorithm
+< wlan client identity
 < wlan client invalid key length
 < wlan client new entry
 < wlan client new network
 < wlan client pairwise cipher
 < wlan client pairwise key algorithm
 < wlan client pairwise key group key
+< wlan client password
 < wlan client psk
 < wlan clients
 < wlan client ssid
@@ -1373,6 +1403,12 @@
 < extrahd unable to read
 < extrahd unable to write
 < extrahd you cant mount
+< firewall graph country
+< firewall graph ip
+< firewall graph port
+< firewall log country
+< firewall log ip
+< firewall log port
 < firewall logs country
 < firewall rules
 < first
@@ -1784,25 +1820,34 @@
 < wlan client
 < wlan client advanced settings
 < wlan client and
+< wlan client anonymous identity
+< wlan client auth auto
+< wlan client authentication settings
+< wlan client auth peap
+< wlan client auth ttls
 < wlan client bssid
 < wlan client ccmp
 < wlan client configuration
 < wlan client disconnected
 < wlan client duplicate ssid
+< wlan client eap authentication method
 < wlan client edit entry
 < wlan client encryption
+< wlan client encryption eap
 < wlan client encryption none
 < wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client group cipher
 < wlan client group key algorithm
+< wlan client identity
 < wlan client invalid key length
 < wlan client new entry
 < wlan client new network
 < wlan client pairwise cipher
 < wlan client pairwise key algorithm
 < wlan client pairwise key group key
+< wlan client password
 < wlan client psk
 < wlan clients
 < wlan client ssid
@@ -1964,6 +2009,12 @@
 < extrahd unable to read
 < extrahd unable to write
 < extrahd you cant mount
+< firewall graph country
+< firewall graph ip
+< firewall graph port
+< firewall log country
+< firewall log ip
+< firewall log port
 < firewall logs country
 < firewall rules
 < first
@@ -2377,25 +2428,34 @@
 < wlan client
 < wlan client advanced settings
 < wlan client and
+< wlan client anonymous identity
+< wlan client auth auto
+< wlan client authentication settings
+< wlan client auth peap
+< wlan client auth ttls
 < wlan client bssid
 < wlan client ccmp
 < wlan client configuration
 < wlan client disconnected
 < wlan client duplicate ssid
+< wlan client eap authentication method
 < wlan client edit entry
 < wlan client encryption
+< wlan client encryption eap
 < wlan client encryption none
 < wlan client encryption wep
 < wlan client encryption wpa
 < wlan client encryption wpa2
 < wlan client group cipher
 < wlan client group key algorithm
+< wlan client identity
 < wlan client invalid key length
 < wlan client new entry
 < wlan client new network
 < wlan client pairwise cipher
 < wlan client pairwise key algorithm
 < wlan client pairwise key group key
+< wlan client password
 < wlan client psk
 < wlan clients
 < wlan client ssid
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index a2d0273df..70ab10a56 100644
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -19,8 +19,8 @@
 #                                                                             #
 ###############################################################################
 
-# DEVICE,ENABLED,MODE,WPA_MODE,SSID,PSK,PRIO
-# wlan0,on,WPA2,,Use This One Mum,ThisIsTheKey,2
+# DEVICE,ENABLED,MODE,WPA_MODE,SSID,PSK,PRIO,AUTH,ANONYMOUS,IDENTITY,PASSWORD
+# wlan0,on,WPA2,,Use This One Mum,ThisIsTheKey,2,TTLS,anonymous,username,password
 
 use strict;
 
@@ -132,6 +132,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
 		push(@config, $settings{'SSID'});
 		push(@config, $settings{'PSK'});
 		push(@config, $settings{'PRIO'});
+		push(@config, $settings{'AUTH'});
+		push(@config, $settings{'ANONYMOUS'});
+		push(@config, $settings{'IDENTITY'});
+		push(@config, $settings{'PASSWORD'});
 
 		# Add the new configuration and write all the stuff to the configuration file.
 		my $line = join(',', @config) . "\n";
@@ -164,6 +168,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) {
 			$settings{'SSID'}       = $config[5];
 			$settings{'PSK'}        = $config[6];
 			$settings{'PRIO'}       = $config[7];
+			$settings{'AUTH'}	= $config[8];
+			$settings{'ANONYMOUS'}	= $config[9];
+			$settings{'IDENTITY'}	= $config[10];
+			$settings{'PASSWORD'}	= $config[11];
 		}
 	}
 }
@@ -181,12 +189,16 @@ if ($settings{'ACTION'} eq $Lang::tr{'update'}) {
 			if ($config[0] eq $settings{'ID'}) {
 				# Update all configuration settings.
 				# ID and INTERFACE cannot be changed.
-				$config[2] = $settings{'ENABLED'};
-				$config[3] = $settings{'ENCRYPTION'};
-				$config[4] = $settings{'WPA_MODE'};
-				$config[5] = $settings{'SSID'};
-				$config[6] = $settings{'PSK'};
-				$config[7] = $settings{'PRIO'};
+				$config[2]  = $settings{'ENABLED'};
+				$config[3]  = $settings{'ENCRYPTION'};
+				$config[4]  = $settings{'WPA_MODE'};
+				$config[5]  = $settings{'SSID'};
+				$config[6]  = $settings{'PSK'};
+				$config[7]  = $settings{'PRIO'};
+				$config[8]  = $settings{'AUTH'};
+				$config[9]  = $settings{'ANONYMOUS'};
+				$config[10] = $settings{'IDENTITY'};
+				$config[11] = $settings{'PASSWORD'};
 
 				$line = join(',', @config);
 			}
@@ -312,9 +324,34 @@ END
 			$encryption_mode = $Lang::tr{'wlan client encryption wpa'};
 		} elsif ($config[3] eq "WPA2") {
 			$encryption_mode = $Lang::tr{'wlan client encryption wpa2'};
+		} elsif ($config[3] eq "EAP") {
+			$encryption_mode = $Lang::tr{'wlan client encryption eap'};
 		}
 
-		if (($config[3] eq "WPA") || ($config[3] eq "WPA2")) {
+		if ($config[3] eq "EAP") {
+			if ($config[8] eq "PEAP") {
+				$encryption_mode .= " ($Lang::tr{'wlan client auth peap'})";
+			} elsif ($config[8] eq "TTLS") {
+				$encryption_mode .= " ($Lang::tr{'wlan client auth ttls'})";
+			} else {
+				$encryption_mode .= " ($Lang::tr{'wlan client auth auto'})";
+			}
+
+			$encryption_mode .= "<hr>";
+
+			if ($config[10]) {
+				$encryption_mode .= "<strong>$Lang::tr{'wlan client identity'}</strong>: ";
+				$encryption_mode .= $config[10];
+			}
+
+			# Anonymous identity
+			if ($config[9]) {
+				$encryption_mode .= "<br>";
+				$encryption_mode .= "<strong>$Lang::tr{'wlan client anonymous identity'}</strong>: ";
+				$encryption_mode .= $config[9];
+			}
+
+		} elsif (($config[3] eq "WPA") || ($config[3] eq "WPA2")) {
 			my $wpa_pairwise = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}";
 			my $wpa_group = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}";
 
@@ -437,6 +474,12 @@ sub showEditBox() {
 	$selected{'WPA_MODE'}{'TKIP-TKIP'} = '';
 	$selected{'WPA_MODE'}{$settings{'WPA_MODE'}} = "selected='selected'";
 
+	$selected{'AUTH'} = ();
+	$selected{'AUTH'}{''} = '';
+	$selected{'AUTH'}{'PEAP'} = '';
+	$selected{'AUTH'}{'TTLS'} = '';
+	$selected{'AUTH'}{$settings{'AUTH'}} = "selected='selected'";
+
 	$selected{'PRIO'} = ();
 	$selected{'PRIO'}{'0'} = '';
 	$selected{'PRIO'}{'1'} = '';
@@ -461,6 +504,7 @@ sub showEditBox() {
 					<td width='40%'>
 						<select name='ENCRYPTION'>
 							<option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option>
+							<option value="EAP"  $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option>
 							<option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option>
 							<option value="WPA"  $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option>
 							<option value="WEP"  $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option>							
@@ -477,6 +521,57 @@ sub showEditBox() {
 
 			<br>
 			<hr>
+
+			<strong>
+				$Lang::tr{'wlan client authentication settings'}:
+			</strong>
+
+			<table width='100%'>
+				<tr>
+					<td class='base' width='20%'>
+						$Lang::tr{'wlan client eap authentication method'}:
+					</td>
+					<td width='40%'>
+						<select name='AUTH'>
+							<option value="" $selected{'AUTH'}{''}>$Lang::tr{'wlan client auth auto'}</option>
+							<option value="PEAP" $selected{'AUTH'}{'PEAP'}>$Lang::tr{'wlan client auth peap'}</option>
+							<option value="TTLS" $selected{'AUTH'}{'TTLS'}>$Lang::tr{'wlan client auth ttls'}</option>
+						</select>
+					</td>
+					<td colspan="2" width='40%'></td>
+				</tr>
+				<tr>
+					<td class='base' width='20%'>
+						$Lang::tr{'wlan client anonymous identity'}:
+					</td>
+					<td width='40%'>
+						<input type="text" name="ANONYMOUS" value="$settings{"ANONYMOUS"}" size="25" />
+					</td>
+					<td colspan="2" width='40%'></td>
+				</tr>
+				<tr>
+					<td class='base' width='20%'>
+						$Lang::tr{'wlan client identity'}:
+					</td>
+					<td width='40%'>
+						<input type="text" name="IDENTITY" value="$settings{"IDENTITY"}" size="25" />
+					</td>
+					<td colspan="2" width='40%'></td>
+				</tr>
+				<tr>
+					<td class='base' width='20%'>
+						$Lang::tr{'wlan client password'}:
+					</td>
+					<td width='40%'>
+						<input type="password" name="PASSWORD" value="$settings{"PASSWORD"}" size="25" />
+					</td>
+					<td colspan="2" width='40%'></td>
+				</tr>
+			</table>
+
+			<br>
+			<hr>
+
 			
 			<strong>
 				$Lang::tr{'wlan client advanced settings'}:
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6443abe7e..c65a64ba6 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2659,25 +2659,34 @@
 'wlan client' => 'WLAN-Client',
 'wlan client advanced settings' => 'Erweiterte Einstellungen',
 'wlan client and' => 'und',
+'wlan client anonymous identity' => 'Anonyme Identität',
+'wlan client auth auto' => 'Auto',
+'wlan client auth peap' => 'PEAP',
+'wlan client auth ttls' => 'TTLS',
+'wlan client authentication settings' => 'Authentifizierungseinstellungen',
 'wlan client bssid' => 'BSSID',
 'wlan client ccmp' => 'CCMP',
 'wlan client configuration' => 'WLAN-Client-Konfiguration',
 'wlan client disconnected' => 'Nicht verbunden',
 'wlan client duplicate ssid' => 'Doppelte SSID',
+'wlan client eap authentication method' => 'EAP-Authentifizierungsmethode',
 'wlan client edit entry' => 'Verbindung bearbeiten',
 'wlan client encryption' => 'Verschlüsselung',
+'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'Keine',
 'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Gruppenchiffre',
 'wlan client group key algorithm' => 'GKA',
+'wlan client identity' => 'Identität',
 'wlan client invalid key length' => 'Ungültige Schlüssellänge.',
 'wlan client new entry' => 'Neue WLAN-Client-Konfiguration erstellen',
 'wlan client new network' => 'Neues Netzwerk',
 'wlan client pairwise cipher' => 'Paarweise Chiffre',
 'wlan client pairwise key algorithm' => 'PKA',
 'wlan client pairwise key group key' => 'Paarweise-/Gruppenschlüssel',
+'wlan client password' => 'Passwort',
 'wlan client psk' => 'Schlüssel',
 'wlan client ssid' => 'SSID',
 'wlan client tkip' => 'TKIP',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4c62471f7..71a283cc5 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2704,25 +2704,34 @@
 'wlan client' => 'Wireless client',
 'wlan client advanced settings' => 'Advanced settings',
 'wlan client and' => 'and',
+'wlan client anonymous identity' => 'Anonymous Identity',
+'wlan client auth auto' => 'Auto',
+'wlan client auth peap' => 'PEAP',
+'wlan client auth ttls' => 'TTLS',
+'wlan client authentication settings' => 'Authentication Settings',
 'wlan client bssid' => 'BSSID',
 'wlan client ccmp' => 'CCMP',
 'wlan client configuration' => 'Wireless Client Configuration',
 'wlan client disconnected' => 'Disconnected',
 'wlan client duplicate ssid' => 'Duplicate SSID',
+'wlan client eap authentication method' => 'EAP Authentication Method',
 'wlan client edit entry' => 'Edit wireless client configuration',
 'wlan client encryption' => 'Encryption',
+'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'None',
 'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Group cipher',
 'wlan client group key algorithm' => 'GKA',
+'wlan client identity' => 'Identity',
 'wlan client invalid key length' => 'Invalid key length.',
 'wlan client new entry' => 'Create new wireless client configuration',
 'wlan client new network' => 'New network',
 'wlan client pairwise cipher' => 'Pairwise cipher',
 'wlan client pairwise key algorithm' => 'PKA',
 'wlan client pairwise key group key' => 'Pairwise key/group key',
+'wlan client password' => 'Password',
 'wlan client psk' => 'Pre-shared key',
 'wlan client ssid' => 'SSID',
 'wlan client tkip' => 'TKIP',