diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 26088df925..a1de77bcbd 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -338,8 +338,8 @@ class ucp_register
 					$messenger->assign_vars(array(
 						'SITENAME'		=> $config['sitename'],
 						'WELCOME_MSG'	=> sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
-						'USERNAME'		=> html_entity_decode($user_row['username'], ENT_COMPAT, 'UTF-8'),
-						'PASSWORD'		=> html_entity_decode($user_row['user_password']),
+						'USERNAME'		=> html_entity_decode($data['username'], ENT_COMPAT, 'UTF-8'),
+						'PASSWORD'		=> html_entity_decode($data['new_password']),
 						'EMAIL_SIG'		=> str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
 
 						'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")