diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index e447028b74d5a503bdcff15b824a7da3e8898fc2..53d5f895986bfd2ecc75f72968b867bde936ac93 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -220,7 +220,7 @@ $form["tabs"]['address'] = array (
 			'datatype'	=> 'VARCHAR',
 
 			'formtype'	=> 'SELECT',
-			'default'	=> (isset($conf['language']) ? $conf['language'] : ''),
+			'default'	=> (isset($conf['language']) ? strtoupper($conf['language']) : ''),
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
 										'keyfield'=> 'iso',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 550004c0951c5dd89aad7437b7ad25b1457acecc..77e2f54f79348a83a7d05d7554e3fdd465fde104 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -220,7 +220,7 @@ $form["tabs"]['address'] = array (
 			'datatype'	=> 'VARCHAR',
 
 			'formtype'	=> 'SELECT',
-			'default'	=> (isset($conf['language']) ? $conf['language'] : ''),
+			'default'	=> (isset($conf['language']) ? strtoupper($conf['language']) : ''),
 			'datasource'	=> array ( 	'type'	=> 'SQL',
 										'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
 										'keyfield'=> 'iso',