diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f7c936c012..23ef2e5d12 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -83,6 +83,10 @@
 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
 		<li>[Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions</li>
+		<li>[Fix] Fixed faulty form token for acp_ranks (Bug #14736)</li>
+		<li>[Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)</li>
+
+
 	</ul>
 
 	<a name="v30rc5"></a><h3>1.ii. Changes since 3.0.RC5</h3>
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 3a572e128c..ed35be3db7 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -224,9 +224,17 @@ function is_topic_locked($bool)
 */
 function make_uid($timestamp)
 {
-	return substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+	static $last_timestamp, $last_uid;
+
+	if (empty($last_timestamp) || $timestamp != $last_timestamp)
+	{
+		$last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+	}
+	$last_timestamp = $timestamp;
+	return $last_uid;
 }
 
+
 /**
 * Validate a website address
 */