diff --git a/phpBB/develop/adjust_sizes.php b/phpBB/develop/adjust_sizes.php
index 8683a5b9dc..9c0612dd8a 100644
--- a/phpBB/develop/adjust_sizes.php
+++ b/phpBB/develop/adjust_sizes.php
@@ -41,7 +41,6 @@ while ($row = $db->sql_fetchrow($result))
 	// Only if a bbcode uid is present, the signature present and a size tag used...
 	if ($bbcode_uid && $row['user_sig'] && strpos($row['user_sig'], '[size=') !== false)
 	{
-
 		$row['user_sig'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['user_sig']);
 
 		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "'
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 26f5407915..512f0598be 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1156,7 +1156,7 @@ function phpbb_prepare_message($message)
 		// Adjust size...
 		if (strpos($message, '[size=') !== false)
 		{
-			$message = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $message);
+			$message = preg_replace_callback('/\[size=(\d*):' . $convert->row['old_bbcode_uid'] . '\]/', 'replace_size', $message);
 		}
 
 		$message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message);