diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 908c4d200..c044dc1e3 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -36,11 +36,12 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it
 {
 	foreach($pref['lan_log_list'] as $path => $file)
 	{
-		$file = str_replace('--LAN--', e_LANGUAGE, $file);
-		
-	//	echo "orig = ".$file."     ";
+	//	$file = str_replace('--LAN--', e_LANGUAGE, $file);
+
 		//e107::lan($path,'log',true);
-		e107::includeLan(e_PLUGIN.$path.'/languages/'.$file);
+	//	e107::includeLan(e_PLUGIN.$path.'/languages/'.$file);
+		e107::includeLan(e_PLUGIN.$path.'/languages/'.e_LANGUAGE."_log.php");
+		e107::includeLan(e_PLUGIN.$path.'/languages/'.e_LANGUAGE."/".e_LANGUAGE."_log.php");
 	}
 }
 
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 0a5af82e3..14fa57bfa 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -1571,9 +1571,14 @@ class system_tools
 
 		$plg->buildAddonPrefLists();
 
+		$plgClass = e107::getPlugin();
+
+
 		foreach($plg->getDetected() as $folder)
 		{
 			$plg->load($folder);
+			$plgClass->plugFolder = $folder;
+			$plgClass->XmlLanguageFiles('refresh');
 
 			$name   = $plg->getName();
 			$addons = $plg->getAddons();