diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f50e5a062f..f5d6da94b9 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -402,6 +402,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9888'>PHPBB3-9888</a>] -         Update fails when Bing [Bot] was already added to the users table
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9891'>PHPBB3-9891</a>] -         Updater drops language-selection after database-update
+</li>
 </ul>
 
 <h4>        Improvement
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 91ecc6d302..a1c3239cbf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -486,7 +486,7 @@ else
 
 	<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
 
-	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
+	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
 
 <?php
 }
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 1399a99a31..39c74d272b 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -194,13 +194,13 @@ class install_update extends module
 		}
 
 		// Check if the update files are actually meant to update from the current version
-		if ($config['version'] != $this->update_info['version']['from'])
+		if ($this->current_version != $this->update_info['version']['from'])
 		{
 			$this->unequal_version = true;
 
 			$template->assign_vars(array(
 				'S_ERROR'	=> true,
-				'ERROR_MSG'	=> sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $config['version'], $this->update_info['version']['from'], $this->update_info['version']['to']),
+				'ERROR_MSG'	=> sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $this->current_version, $this->update_info['version']['from'], $this->update_info['version']['to']),
 			));
 		}