diff --git a/install/includes/locale.php b/install/includes/locale.php
index 1c716f36..c558de0a 100644
--- a/install/includes/locale.php
+++ b/install/includes/locale.php
@@ -8,9 +8,9 @@ if(isset($_POST['lang']))
 
 if(isset($_COOKIE['locale']))
 {
-	$locale_ = $_COOKIE['locale'];
-	$lang_size = strlen($locale_);
-	if(!$lang_size || $lang_size > 4 || !preg_match("/[a-z]/", $locale_)) // validate locale
+	$detected_locale = $_COOKIE['locale'];
+	$lang_size = strlen($detected_locale);
+	if(!$lang_size || $lang_size > 4 || !preg_match("/[a-z]/", $detected_locale)) // validate locale
 		$_COOKIE['locale'] = "en";
 }
 else
@@ -18,7 +18,7 @@ else
 	// detect locale
 	$locale_s = get_browser_languages();
 	if(!count($locale_s))
-		$locale_ = 'en';
+		$detected_locale = 'en';
 	else
 	{
 		foreach($locale_s as $id => $tmp)
@@ -26,27 +26,26 @@ else
 			$tmp_file = LOCALE .  $tmp;
 			if(@file_exists($tmp_file))
 			{
-				$locale_ = $tmp;
+				$detected_locale = $tmp;
 				break;
 			}
 		}
 	}
 
-	if(!isset($locale_))
-		$locale_ = 'en';
+	if(!isset($detected_locale))
+		$detected_locale = 'en';
 }
 
 require LOCALE . 'en/main.php';
 require LOCALE . 'en/install.php';
 
-$file_main = LOCALE . $locale_ . '/main.php';
+$file_main = LOCALE . $detected_locale . '/main.php';
 if(!file_exists($file_main))
 	$file_main = LOCALE . 'en/main.php';
 
-$file_install = LOCALE . $locale_ . '/install.php';
+$file_install = LOCALE . $detected_locale . '/install.php';
 if(!file_exists($file_install))
 	$file_install = LOCALE . 'en/install.php';
 
 require $file_main;
 require $file_install;
-?>
\ No newline at end of file
diff --git a/install/steps/1-welcome.php b/install/steps/1-welcome.php
index 76a25148..47ef9d15 100644
--- a/install/steps/1-welcome.php
+++ b/install/steps/1-welcome.php
@@ -23,6 +23,7 @@ else {
 		'locales' => $locales,
 		'locale' => $locale,
 		'cookie_locale' => @$_COOKIE['locale'],
+		'detected_locale' => @$detected_locale,
 		'buttons' => next_buttons(false, true)
 	));
-}
\ No newline at end of file
+}
diff --git a/system/templates/install.welcome.html.twig b/system/templates/install.welcome.html.twig
index 9fb24a1c..b422ddb6 100644
--- a/system/templates/install.welcome.html.twig
+++ b/system/templates/install.welcome.html.twig
@@ -3,10 +3,10 @@
 	<div class="input"><p>{{ locale.step_welcome_desc }}</p>
 		<select name="lang">
 			{% for locale_ in locales %}
-				<option value="{{ locale_.id }}"{% if cookie_locale == locale_.id %} selected{% endif %}>{{ locale_.name }}</option>
+				<option value="{{ locale_.id }}"{% if (detected_locale is not null and locale_.id == detected_locale) or cookie_locale == locale_.id %} selected{% endif %}>{{ locale_.name }}</option>
 			{% endfor %}
 		</select>
 	</div>
 
 	{{ buttons|raw }}
-</form>
\ No newline at end of file
+</form>