3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 6d591786c4..fdfa6821ed 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -114,8 +114,6 @@ class helper
 		$this->router = $router;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpbb_admin_path = $phpbb_root_path . 'adm/';
-
-		$this->handle_language_select();
 	}
 
 	/**
@@ -167,7 +165,7 @@ class helper
 	/**
 	 * Handles language selector form
 	 */
-	protected function handle_language_select()
+	public function handle_language_select()
 	{
 		$lang = null;
 
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php
index c21b0d831b..80f6651a39 100644
--- a/phpBB/phpbb/install/controller/install.php
+++ b/phpBB/phpbb/install/controller/install.php
@@ -176,6 +176,8 @@ class install
 			// Determine whether the installation was started or not
 			if (true)
 			{
+				$this->controller_helper->handle_language_select();
+
 				// Set active stage
 				$this->menu_provider->set_nav_property(
 					array('install', 0, 'introduction'),
diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
index 8e1874984b..c2d9572284 100644
--- a/phpBB/phpbb/install/controller/installer_index.php
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -53,6 +53,8 @@ class installer_index
 
 	public function handle($mode)
 	{
+		$this->helper->handle_language_select();
+
 		switch ($mode)
 		{
 			case "intro":