diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index c6f8b327779..e44e11db7e8 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -93,7 +93,6 @@ class FormAdmin
 			{
 				print '<option value="'.$key.'">'.$value.'</option>';
 			}
-			$i++;
 		}
 		print '</select>';
 	}
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 17ab5586d6e..adab8665104 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -530,7 +530,7 @@ class Translate {
 			{
 				$this->load("languages");
 
-				if ($conf->global->MAIN_SHOW_LANGUAGE_CODE)
+				if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
 				{
 					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
 				}