diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 846c71f738..0705154a9b 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -114,6 +114,7 @@
 		<li>[Fix] Add missing language entries. (Bug #55095)</li>
 		<li>[Fix] Do not permit unauthorised users to delete private messages from folder listing. (Bug #54355)</li>
 		<li>[Fix] Correctly check for empty strings in custom profile fields. (Bug #55335)</li>
+		<li>[Fix] Use correct options to parse BBCodes in signatures when previewing PMs.</li>
 		<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
 		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
 		<li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li>
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d9e3deaa41..4d72d45f81 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -767,7 +767,7 @@ function compose_pm($id, $mode, $action)
 			$parse_sig->bbcode_uid = $preview_signature_uid;
 			$parse_sig->bbcode_bitfield = $preview_signature_bitfield;
 
-			$parse_sig->format_display($enable_bbcode, $enable_urls, $enable_smilies);
+			$parse_sig->format_display($config['allow_sig_bbcode'], $config['allow_sig_links'], $config['allow_sig_smilies']);
 			$preview_signature = $parse_sig->message;
 			unset($parse_sig);
 		}