diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 727cf435c9..907fed3681 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -52,7 +52,7 @@ $phpbb_admin_path = './';
 
 // Some oft used variables
 $safe_mode		= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
-$file_uploads 	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
+$file_uploads	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index e19c8ca332..5cdf2eeea0 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -1,5 +1,15 @@
 <!-- INCLUDE install_header.html -->
 
+<script type="text/javascript">
+<!--
+function popup(url, width, height)
+{
+	window.open(url.replace(/&amp;/g, '&'), '_popup', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
+	return false;
+}
+//-->
+</script>
+
 <!-- IF S_ERROR -->
 	<h1>{L_NOTICE}</h1>
 	<p style="color: red;">{ERROR_MSG}</p>
@@ -110,9 +120,6 @@
 
 				<p>{files.EXPLAIN}</p>
 
-				<!--table cellspacing="1">
-					<col class="row1" /><col class="row2" /><col class="row2" />
-				<tbody -->
 				<fieldset>
 					<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
 			<!-- ELSE -->
@@ -129,7 +136,7 @@
 							<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
 							<!-- ENDIF -->
 						</dt>
-						<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup({files.UA_SHOW_DIFF}, 700, 500);">{files.L_SHOW_DIFF}</a> ]</dd>
+						<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]</dd>
 						<!-- IF files.S_CUSTOM -->
 							<dd><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
 						<!-- ENDIF -->
@@ -185,6 +192,25 @@
 
 	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
 
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+	<br /><br />
+
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
 	<table cellspacing="1">
@@ -207,23 +233,6 @@
 	</tbody>
 	</table>
 
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
 <!-- ELSEIF S_FTP_UPLOAD -->
 
 	<h1>{L_SELECT_FTP_SETTINGS}</h1>
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 25ed12b824..5ffef1c2da 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -301,6 +301,9 @@ $database_update_info = array(
 			GROUPS_TABLE		=> array(
 				'group_founder_manage'	=> array('BOOL', 0),
 			),
+			USERS_TABLE			=> array(
+				'user_pass_convert'		=> array('BOOL', 0),
+			),
 		),
 	),
 	// Latest version
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 82ee374e52..aea6043f50 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -58,6 +58,9 @@ class install_update extends module
 	var $latest_version;
 	var $current_version;
 
+	// Set to false
+	var $test_update = false;
+
 	function install_update(&$p_master)
 	{
 		$this->p_master = &$p_master;
@@ -93,7 +96,9 @@ class install_update extends module
 
 		include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx);
 
-		// Check for user session
+		/**
+		* Check for user session
+		* - commented out for beta3 with "broken" install check routine
 		if (!$user->data['is_registered'])
 		{
 			login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']);
@@ -103,6 +108,7 @@ class install_update extends module
 		{
 			trigger_error($user->lang['NO_AUTH_UPDATE']);
 		}
+		*/
 
 		// If we are within the intro page we need to make sure we get up-to-date version info
 		if ($sub == 'intro')
@@ -164,6 +170,20 @@ class install_update extends module
 			return;
 		}
 
+		// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
+		if (in_array('adm/style/install_update.html', $this->update_info['files']))
+		{
+			$this->tpl_name = '../../install/update/new/adm/style/install_update';
+		}
+
+		// What about the language file? Got it updated?
+		if (in_array('language/en/install.php', $this->update_info['files']))
+		{
+			$lang = array();
+			include('./update/new/language/en/install.php');
+			$user->lang = array_merge($user->lang, $lang);
+		}
+
 		// Make sure we stay at the file check if checking the files again
 		if (!empty($_POST['check_again']))
 		{
@@ -670,7 +690,7 @@ class install_update extends module
 
 		$status = request_var('status', '');
 		$file = request_var('file', '');
-		$diff_mode = request_var('diff_mode', 'side_by_side');
+		$diff_mode = request_var('diff_mode', 'inline');
 
 		// First of all make sure the file is within our file update list with the correct status
 		$found_entry = array();
@@ -684,7 +704,7 @@ class install_update extends module
 
 		if (empty($found_entry))
 		{
-			trigger_error('File not allowed to be diffed', E_USER_ERROR);
+			trigger_error($user->lang['FILE_DIFF_NOT_ALLOWED'], E_USER_ERROR);
 		}
 
 		// If the status is 'up_to_date' then we do not need to show a diff
@@ -947,6 +967,11 @@ class install_update extends module
 					$info = explode("\n", $info);
 					$info = trim($info[0]);
 				}
+
+				if ($this->test_update !== false)
+				{
+					$info = $this->test_update;
+				}
 			break;
 
 			case 'update_info':
@@ -963,7 +988,7 @@ class install_update extends module
 					// Adjust the update info file to hold some specific style-related information
 					$info['custom'] = array();
 
-					// Get custom installed styles...
+					/* Get custom installed styles...
 					$sql = 'SELECT template_name, template_path
 						FROM ' . STYLES_TEMPLATE_TABLE . "
 						WHERE template_name NOT IN ('subSilver', 'BLABLA')";
@@ -990,6 +1015,7 @@ class install_update extends module
 							}
 						}
 					}
+					*/
 				}
 			break;
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 36fe45d5c8..7dbf0106e6 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -199,9 +199,9 @@ $lang = array_merge($lang, array(
 	'INST_ERR_FTP_LOGIN'		=> 'Could not login to FTP server, check your username and password',
 	'INST_ERR_MISSING_DATA'		=> 'You must fill out all fields in this block',
 	'INST_ERR_NO_DB'			=> 'Cannot load the PHP module for the selected database type',
-	'INST_ERR_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
-	'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.',
-	'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.',
+	'INST_ERR_PASSWORD_MISMATCH'	=> 'The passwords you entered did not match.',
+	'INST_ERR_PASSWORD_TOO_LONG'	=> 'The password you entered is too long. The maximum length is 30 characters.',
+	'INST_ERR_PASSWORD_TOO_SHORT'	=> 'The password you entered is too short. The minimum length is 6 characters.',
 	'INST_ERR_PREFIX'			=> 'Tables with the specified prefix already exist, please choose an alternative.',
 	'INST_ERR_PREFIX_INVALID'	=> 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen',
 	'INST_ERR_PREFIX_TOO_LONG'	=> 'The table prefix you have specified is too long. The maximum length is %d characters.',
@@ -255,7 +255,7 @@ $lang = array_merge($lang, array(
 	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If unsure, just proceed to the next page, this can be altered from the Administration Panel later.',
 	'STAGE_CONFIG_FILE'			=> 'Configuration File',
 	'STAGE_CREATE_TABLE'		=> 'Create Database Tables',
-	'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
+	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
 	'STAGE_DATABASE'			=> 'Database Settings',
 	'STAGE_FINAL'				=> 'Final Stage',
 	'STAGE_INTRO'				=> 'Introduction',
@@ -301,8 +301,8 @@ $lang = array_merge($lang, array(
 	'CHECK_FILES_AGAIN'				=> 'Check files again',
 	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
 	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
-	'COLLECTED_INFORMATION'		=> 'Information on collected files',
-	'COLLECTED_INFORMATION_EXPLAIN'=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
+	'COLLECTED_INFORMATION'			=> 'Information on collected files',
+	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
 	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Don’t forget to delete, rename or move your install directory!',
 	'CURRENT_FILE'					=> 'Current original file',
 	'CURRENT_VERSION'				=> 'Current version',
@@ -325,6 +325,7 @@ $lang = array_merge($lang, array(
 	'ERROR'		=> 'Error',
 
 	'FILE_ALREADY_UP_TO_DATE'		=> 'File is already up to date',
+	'FILE_DIFF_NOT_ALLOWED'			=> 'File not allowed to be diffed',
 	'FILE_USED'						=> 'Information used from',			// Single file
 	'FILES_CONFLICT'				=> 'Conflict files',
 	'FILES_CONFLICT_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',