diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
index 3f2dc8b07..ed758e608 100644
--- a/e107_core/shortcodes/batch/page_shortcodes.php
+++ b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -188,13 +188,16 @@ class cpage_shortcodes extends e_shortcode
 
 		if(e107::getPref('comments_disabled') == 0 && !$comflag)
 		{
-			if(defined('BOOTSTRAP') && BOOTSTRAP)
+			if(ADMIN)
 			{
-				return e107::getMessage()->addInfo(LAN_PAGE_17)->render(); 
-			}
-			else
-			{
-				return "<br /><div style='text-align:center'><b>".LAN_PAGE_17."</b></div>";
+				if(defined('BOOTSTRAP') && BOOTSTRAP)
+				{
+					return e107::getMessage()->addDebug(LAN_PAGE_17)->render(); 
+				}
+				else
+				{
+					return "<br /><div style='text-align:center'><b>".LAN_PAGE_17."</b></div>";
+				}
 			}
 		}
 		
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index f5419faa8..fcb78c149 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -1317,13 +1317,16 @@ class news_front
 			// Only show message if global comments are enabled, but current news item comments are disabled
 			if(e107::getPref('comments_disabled') == 0 && $news['news_allow_comments'] == 1)
 			{
-				if(defined('BOOTSTRAP') && BOOTSTRAP)
+				if(ADMIN)
 				{
-					return e107::getMessage()->addInfo(LAN_NEWS_13)->render(); 
-				}
-				else
-				{
-					return "<br /><div style='text-align:center'><b>".LAN_NEWS_13."</b></div>";
+					if(defined('BOOTSTRAP') && BOOTSTRAP)
+					{
+						return e107::getMessage()->addDebug(LAN_NEWS_13)->render(); 
+					}
+					else
+					{
+						return "<br /><div style='text-align:center'><b>".LAN_NEWS_13."</b></div>";
+					}
 				}
 			}
 		}