diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 40e938546c..f4a79411d1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -165,6 +165,7 @@
 		<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
 		<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
 		<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
+		<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
 		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
 		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
 		<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 27d841c81b..cc701a0540 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -258,7 +258,7 @@ class mcp_reports
 				}
 				unset($forum_list_read);
 
-				if ($topic_id && $forum_id)
+				if ($topic_id)
 				{
 					$topic_info = get_topic_data(array($topic_id));
 
@@ -267,12 +267,15 @@ class mcp_reports
 						trigger_error('TOPIC_NOT_EXIST');
 					}
 
-					$topic_info = $topic_info[$topic_id];
-					$forum_id = $topic_info['forum_id'];
-				}
-				else if ($topic_id && !$forum_id)
-				{
-					$topic_id = 0;
+					if ($forum_id != $topic_info[$topic_id]['forum_id'])
+					{
+						$topic_id = 0;
+					}
+					else
+					{
+						$topic_info = $topic_info[$topic_id];
+						$forum_id = (int) $topic_info['forum_id'];
+					}
 				}
 
 				$forum_list = array();