diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 7493763bd..072f5d228 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -517,6 +517,11 @@ class e_bbcode
 		{
 	        $BBCODE_TEMPLATE = $temp[$template];
 		}
+		elseif(strpos($template,"{")!==false) // custom template provided manually. eg. $template = "<div class='btn-group inline-text'>{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}</div>"
+		{
+			$BBCODE_TEMPLATE = $template;	
+			$template = 'comment';	
+		}
 		else
 		{
 			$BBCODE_TEMPLATE = $BBCODE_TEMPLATE;