diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index 5530fe3f03..f823e85148 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -590,6 +590,18 @@ class phpbb_user extends phpbb_session
 				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
 			}
 
+			if (!file_exists($language_filename))
+			{
+				// File was not found, try to find it in update directory
+				$orig_language_filename = $language_filename;
+				$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
+				if (!file_exists($language_filename))
+				{
+					// Not found either, go back to the original file name
+					$language_filename = $orig_language_filename;
+				}
+			}
+
 			if (!file_exists($language_filename))
 			{
 				global $config;