diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index f37d9b1aef..e0c04528cf 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -290,7 +290,7 @@ class acp_bbcodes
 				if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad))
 				{
 					$repad = $pad + sizeof(array_unique($repad[0]));
-					$replace = preg_replace('/(?<!\\\\)\$([0-9]+)/e', "'\$' . (\$1 + \$pad)", $replace);
+					$replace = preg_replace('/(?<!\\\\)\$([0-9]+)/e', "'\${' . (\$1 + \$pad) . '}'", $replace);
 					$pad = $repad;
 				}
 
@@ -320,7 +320,7 @@ class acp_bbcodes
 				$fp_replace = str_replace($token, $replace, $fp_replace);
 
 				$sp_match = str_replace(preg_quote($token, '!'), '(.*?)', $sp_match);
-				$sp_replace = str_replace($token, '$' . ($n + 1), $sp_replace);
+				$sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace);
 			}
 
 			$fp_match = '!' . $fp_match . '!' . $modifiers;
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 7293f07dc9..7af99e4b57 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -155,6 +155,12 @@ class bbcode
 
 			while ($row = $db->sql_fetchrow($result))
 			{
+				// To circumvent replacing newlines with <br /> for the generated html,
+				// we just remove newlines here. We do not do this within the admin panel to 
+				// let the admin lay out his html code nicely
+				$row['bbcode_tpl'] = str_replace(array("\n", "\r"), '', $row['bbcode_tpl']);
+				$row['second_pass_replace'] = str_replace(array("\n", "\r"), '', $row['second_pass_replace']);
+
 				$rowset[$row['bbcode_id']] = $row;
 			}
 			$db->sql_freeresult($result);