diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 639ae5cd7..0d7f79766 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -1034,7 +1034,7 @@ class e_menu_layout
 
 		;
 
-		$diz = "The Menu-Manager allows you to place and arrange your menus within your theme template. Hover over the sub-areas to modify existing menu items. ";
+		$diz = MENLAN_58;
 
 		$caption .= "<span class='pull-right'><a class='e-tip' title=\"".$tp->toAttribute($diz)."\">".ADMIN_INFO_ICON."</a></span>";
 
@@ -1926,4 +1926,4 @@ function menus_adminmenu()
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 5be9d7986..8a563011f 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1028,9 +1028,9 @@ class e_form
 
 			if(ADMIN)
 			{
-				$EAVATAR = "<b>".e_AVATAR_DEFAULT."</b>";
+				$EAVATAR = e_AVATAR_DEFAULT;
 				$text .= "<div class='alert alert-danger'>";
-				$text .= e107::getParser()->lanVars(LAN_EFORM_006, array('x'=>$EAVATAR));
+				$text .= e107::getParser()->lanVars(e107::getParser()->toHTML(LAN_EFORM_006, true), array('x'=>$EAVATAR));
 				$text .= "</div>"; 
 			}
 
diff --git a/e107_languages/English/admin/lan_menus.php b/e107_languages/English/admin/lan_menus.php
index 35ea84c60..90a2f8098 100644
--- a/e107_languages/English/admin/lan_menus.php
+++ b/e107_languages/English/admin/lan_menus.php
@@ -72,5 +72,5 @@ define("MENLAN_54", "Theme Layout");
 define("MENLAN_55", "Menu Layout");
 define("MENLAN_56", "Custom Pages");
 define("MENLAN_57", "Drag-and-Drop Menus");
-
+define("MENLAN_58", "The Menu-Manager allows you to place and arrange your menus within your theme template. Hover over the sub-areas to modify existing menu items.");
 ?>
diff --git a/e107_languages/English/lan_form_handler.php b/e107_languages/English/lan_form_handler.php
index 05be8335d..e0f24a70b 100644
--- a/e107_languages/English/lan_form_handler.php
+++ b/e107_languages/English/lan_form_handler.php
@@ -14,7 +14,7 @@ define("LAN_EFORM_002", "Choose Avatar");
 define("LAN_EFORM_003", "OR"); 
 define("LAN_EFORM_004", "Choose this avatar"); 
 define("LAN_EFORM_005", "No Avatars Available"); 
-define("LAN_EFORM_006", "Admin-Only Notice: The folder [x] is empty. Upload some default avatars images to this folder for users to choose avatars from.");
+define("LAN_EFORM_006", "Admin-Only Notice:[br]The folder [b][x][/b] is empty.[br]Upload some default avatars images to this folder for users to choose avatars from.");
 define("LAN_EFORM_007", "Media Manager");
 define("LAN_EFORM_008", "Select columns to display");
 define("LAN_EFORM_009", "Display Columns");
@@ -25,3 +25,4 @@ define("LAN_EFORM_013", "go to list");
 define("LAN_EFORM_014", "create another");
 define("LAN_EFORM_015", "edit current");
 define("LAN_EFORM_016", "After submit:");
+?>