diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index e4ae9d778..659c8d67e 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -1416,12 +1416,12 @@ class e_parse_shortcode
 
 		if(strpos($pre, '{') !== false) // shortcode found in wrapper
 		{
-			$pre = $this->parseCodes($pre, true);
+			$pre = $this->parseCodes($pre, true, $this->addedCodes);
 		}
 
 		if(strpos($post, '{') !== false) // shortcode found in wrapper
 		{
-			$post = $this->parseCodes($post, true);
+			$post = $this->parseCodes($post, true, $this->addedCodes);
 		}
 
 		return $pre.$ret.$post;
diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php
index 6305dcf20..bd640724a 100644
--- a/e107_plugins/forum/templates/forum_template.php
+++ b/e107_plugins/forum/templates/forum_template.php
@@ -136,7 +136,7 @@ $FORUM_TEMPLATE['main']['forum']			= 	"<tr>
 
 $FORUM_TEMPLATE['main']['end']				= "</table><div class='forum-footer center'><small>{USERINFOX}</small></div></div>";
 
-
+// $FORUM_WRAPPER['main']['forum']['USERINFOX'] = "{FORUM_BREADCRUMB}(html before){---}(html after)";
 
 // Tracking
 $FORUM_TEMPLATE['track']['start']       = "{FORUM_BREADCRUMB}<div id='forum-track'>