diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 62720e9f64..177c0a1699 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -106,6 +106,7 @@ p,ul,td {font-size:10pt;}
 <li>Limited username length the strict way - duplicate username registrations should no longer occur</li>
 <li>Changed split words handling - now foreign characters are indexed correctly, searching for them works too</li>
 <li>Changed empty email To Field to use a non-disclosure delimiter - Anti-Spam software should handle those mails correctly, they are RFC compliant</li>
+<li>Fixed wrong language var in install.php - FTP Config screen</li>
 </ul>
 
 <a name="203"></a><h3 class="h3">1.ii. Changes since 2.0.3</h3>
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 23c05d4e12..510565411b 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -37,12 +37,12 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
 	{
 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
-		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
+		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array();
 		$sessionmethod = SESSION_METHOD_COOKIE;
 	}
 	else
 	{
-		$sessiondata = '';
+		$sessiondata = array();
 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
 		$sessionmethod = SESSION_METHOD_GET;
 	}
@@ -206,13 +206,13 @@ function session_pagestart($user_ip, $thispage_id)
 
 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
 	{
-		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : '';
+		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array();
 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
 		$sessionmethod = SESSION_METHOD_COOKIE;
 	}
 	else
 	{
-		$sessiondata = '';
+		$sessiondata = array();
 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
 		$sessionmethod = SESSION_METHOD_GET;
 	}
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index 4f93113eec..b045b8eda8 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -493,11 +493,11 @@ else if (!empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] ==
 						<td class="row2"><input type="text" name="ftp_dir"></td>
 					</tr>
 					<tr>
-						<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_password']; ?></span></td>
+						<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_username']; ?></span></td>
 						<td class="row2"><input type="text" name="ftp_user"></td>
 					</tr>
 					<tr>
-						<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_username']; ?></span></td>
+						<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_password']; ?></span></td>
 						<td class="row2"><input type="password" name="ftp_pass"></td>
 					</tr>
 <?php