diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 5b581d1d35..799abf440f 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -668,6 +668,19 @@ if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username'])
 						message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
 					}
 				}
+				
+				// Delete user session, to prevent the user navigating the forum (if logged in) when disabled
+				if (!$user_status)
+				{
+					$sql = "DELETE FROM " . SESSIONS_TABLE . " 
+						WHERE session_user_id = " . $user_id;
+
+					if ( !$db->sql_query($sql) )
+					{
+						message_die(GENERAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
+					}
+				}
+				
 				$message .= $lang['Admin_user_updated'];
 			}
 			else
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index ce480d2ebe..68242458de 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -110,6 +110,8 @@ p,ul,td {font-size:10pt;}
 <li>Fixed alt tag for locked topic images in viewforum_body.tpl</li>
 <li>Fixed typo in groupcp.php - $lang['Unsub_success'] instead of $lang['Usub_success']</li>
 <li>Fixed timezone display</li>
+<li>Fixed wrong display of author quote tag within profile - <b>Cl1mh4224rd</b></li>
+<li>Delete user sessions after deactivating the username to prevent him navigating the forum (if logged in)</li>
 </ul>
 
 <a name="203"></a><h3 class="h3">1.ii. Changes since 2.0.3</h3>
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index 74933c2f42..b477efa965 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -671,7 +671,7 @@ if ( $error )
 	$occupation = stripslashes($occupation);
 	$interests = stripslashes($interests);
 	$signature = stripslashes($signature);
-	$signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $signature) : $signature;
+	$signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid(=|\])/si", '\\3', $signature) : $signature;
 
 	$user_lang = stripslashes($user_lang);
 	$user_dateformat = stripslashes($user_dateformat);
@@ -695,7 +695,7 @@ else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) &&
 	$occupation = $userdata['user_occ'];
 	$interests = $userdata['user_interests'];
 	$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
-	$signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $userdata['user_sig']) : $userdata['user_sig'];
+	$signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid(=|\])/si", '\\3', $userdata['user_sig']) : $userdata['user_sig'];
 
 	$viewemail = $userdata['user_viewemail'];
 	$notifypm = $userdata['user_notify_pm'];