diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 072f5d228..2a3f5213a 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -522,7 +522,11 @@ class e_bbcode
 			$BBCODE_TEMPLATE = $template;	
 			$template = 'comment';	
 		}
-		else
+		elseif(ADMIN_AREA)
+		{
+			$BBCODE_TEMPLATE = $BBCODE_TEMPLATE_ADMIN;	
+		}
+		else // Front-end
 		{
 			$BBCODE_TEMPLATE = $BBCODE_TEMPLATE;	
 		}