diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 2c0bcc6f37..ca61379360 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -205,6 +205,8 @@ p a {
 		<li>[Fix] Don't allow caching to occur in the update sequence (Bug #13207)</li>
 		<li>[Fix] Enforce the max password length for automatically generated password created by the password sender (Bug #13181)</li>
 		<li>[Fix] Handle phpinfo() when expose_php is false (Bug #12777)</li>
+		<li>[Fix] Allow managing of forum roles without global users (Bug #13249)</li>
+
 
 	</ul>
 
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index a7518a287c..b0409a2b28 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -591,13 +591,14 @@ class auth_admin extends auth
 			ORDER BY left_id';
 		$result = $db->sql_query($sql);
 
-		$forum_names = array(0 => '');
+		// If the role is used globally, then reflect that
+		$forum_names = (isset($hold_ary[0])) ? array(0 => '') : array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$forum_names[$row['forum_id']] = $row['forum_name'];
 		}
 		$db->sql_freeresult($result);
-
+ 
 		foreach ($forum_names as $forum_id => $forum_name)
 		{
 			$auth_ary = $hold_ary[$forum_id];