2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 134729ffe9..355c9898c2 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -63,7 +63,8 @@ class ucp_activate
 			$sql_ary = array(
 				'user_actkey'		=> '',
 				'user_password'		=> $user_row['user_newpasswd'],
-				'user_newpasswd'	=> ''
+				'user_newpasswd'	=> '',
+				'user_pass_convert'	=> 0,
 			);
 
 			$sql = 'UPDATE ' . USERS_TABLE . '
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index e843e89139..9ad6766ee8 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -249,10 +249,11 @@ class ucp_pm
 
 				// If new messages arrived, place them into the appropriate folder
 				$num_not_moved = $num_removed = 0;
+				$release = request_var('release', 0);
 
 				if ($user->data['user_new_privmsg'] && $action == 'view_folder')
 				{
-					$return = place_pm_into_folder($global_privmsgs_rules, request_var('release', 0));
+					$return = place_pm_into_folder($global_privmsgs_rules, $release);
 					$num_not_moved = $return['not_moved'];
 
 					// Make sure num_not_moved is valid.
@@ -270,6 +271,12 @@ class ucp_pm
 					$num_removed = $return['deleted'];
 				}
 
+				// If user released the message, we will re-calculate the statistics (again)
+				if ($release)
+				{
+					fix_pm_counts();
+				}
+
 				if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX)
 				{
 					$folder_id = PRIVMSGS_INBOX;