diff --git a/e107_admin/users.php b/e107_admin/users.php
index c54f51576..9b5d9d5f2 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -587,6 +587,7 @@ class users_admin_ui extends e_admin_ui
 	public function ListUnbanTrigger($userid)
 	{
 		$sql = e107::getDb();
+		$tp = e107::getParser();
 		$sysuser = e107::getSystemUser($userid, false);
 		
 		if(!$sysuser->getId())
@@ -599,8 +600,10 @@ class users_admin_ui extends e_admin_ui
 		
 		$sql->update("user", "user_ban='0' WHERE user_id='".$userid."' ");
 		$sql->delete("banlist"," banlist_ip='{$row['user_ip']}' ");
-		
-		e107::getAdminLog()->log_event('USET_06', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_162), E_LOG_INFORMATIVE);
+
+		$vars = array('x'=>$sysuser->getId(), 'y'=> $sysuser->getName(), 'z'=> $sysuser->getValue('email'));
+
+		e107::getAdminLog()->log_event('USET_06', $tp->lanVars( USRLAN_162, $vars), E_LOG_INFORMATIVE);
 		e107::getMessage()->addSuccess("(".$sysuser->getId().".".$sysuser->getName()." - ".$sysuser->getValue('email').") ".USRLAN_9);
 		
 		// List data reload
@@ -618,6 +621,7 @@ class users_admin_ui extends e_admin_ui
 		$mes = e107::getMessage();
 		$admin_log = e107::getAdminLog();
 		$iph = e107::getIPHandler();
+		$tp = e107::getParser();
 		
 		$sysuser = e107::getSystemUser($userid, false);
 		if(!$sysuser->getId())
@@ -635,7 +639,8 @@ class users_admin_ui extends e_admin_ui
 		{
 			if ($sql->update("user","user_ban='1' WHERE user_id='".$userid."' "))
 			{
-				e107::getLog()->add('USET_05', str_replace(array('--UID--','--NAME--'), array($row['user_id'], $row['user_name']), USRLAN_161), E_LOG_INFORMATIVE);
+				$vars = array('x'=>$row['user_id'], 'y'=> $row['user_name']);
+				e107::getLog()->add('USET_05',$tp->lanVars(USRLAN_161, $vars), E_LOG_INFORMATIVE);
 				$mes->addSuccess("(".$userid.".".$row['user_name']." - {$row['user_email']}) ".USRLAN_8);
 			}
 			if (trim($row['user_ip']) == "")
@@ -679,6 +684,7 @@ class users_admin_ui extends e_admin_ui
 		$sysuser = e107::getSystemUser($userid, false);
 		$userMethods = e107::getUserSession();
 		$mes = e107::getMessage();
+		$tp = e107::getParser();
 		
 		$uid = intval($userid);
 		if ($sysuser->getId())
@@ -700,8 +706,14 @@ class users_admin_ui extends e_admin_ui
 		//	e107::getDebug()->log($res);
 
 			$sysuser->save();
-			
-			e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
+
+			$vars = array(
+				'x' => $sysuser->getId(),
+				'y' => $sysuser->getName(),
+				'z' => $sysuser->getValue('email')
+			);
+
+			e107::getLog()->add('USET_10', $tp->lanVars( USRLAN_166, $vars), E_LOG_INFORMATIVE);
 			e107::getEvent()->trigger('userfull', $row); //BC
 			e107::getEvent()->trigger('admin_user_activated', $row);
 			
@@ -817,15 +829,23 @@ class users_admin_ui extends e_admin_ui
 		$user = e107::getUser();
 		$sysuser = e107::getSystemUser($userid, false);
 		$mes = e107::getMessage();
+		$tp = e107::getParser();
 		
 		if(!$user->checkAdminPerms('3'))
 		{
 			$mes->addError(USRLAN_226, 'default', true);
 			
-			$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
-			$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
+			//$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
+			$vars = array(
+				'u' => $sysuser->getId(),
+				'v' => $sysuser->getName(),
+				'w' => $sysuser->getValue('email'),
+				'x' => $user->getId(),
+				'y' => $user->getName(),
+				'z' => $user->getValue('email')
+			);
 			
-			e107::getAdminLog()->log_event('USET_08', str_replace($search, $replace, USRLAN_244), E_LOG_INFORMATIVE);
+			e107::getAdminLog()->log_event('USET_08', $tp->lanVars(USRLAN_244,$vars), E_LOG_INFORMATIVE);
 			$this->redirect('list', 'main', true);
 		}
 
@@ -837,7 +857,9 @@ class users_admin_ui extends e_admin_ui
 		{
 			if($sysuser->set('user_admin', '0')->set('user_perms', '')->save())
 			{
-				e107::getAdminLog()->log_event('USET_09',str_replace(array('--UID--', '--NAME--', '--EMAIL--'),array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_165),E_LOG_INFORMATIVE);
+				$vars = array('x'=>$sysuser->getId(), 'y'=>$sysuser->getName(), 'z'=>$sysuser->getValue('email'));
+
+				e107::getAdminLog()->log_event('USET_09',$tp->lanVars(USRLAN_165, $vars), E_LOG_INFORMATIVE);
 				$mes->addSuccess($sysuser->getName()." (".$sysuser->getValue('email').") ".USRLAN_6);
 				$this->getTreeModel()->load(true);
 			}
@@ -865,14 +887,25 @@ class users_admin_ui extends e_admin_ui
 		$sysuser = e107::getSystemUser($userid, false);
 		$admin_log = e107::getAdminLog();
 		$mes = e107::getMessage();
+		$tp = e107::getParser();
 		
 		if(!$user->checkAdminPerms('3'))
 		{
 			$mes->addError(USRLAN_226, 'default', true);
-			$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
-			$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
+		//	$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
+
+			$vars = array(
+				'u' => $sysuser->getId(),
+				'v' => $sysuser->getName(),
+				'w' => $sysuser->getValue('email'),
+				'x' => $user->getId(),
+				'y' => $user->getName(),
+				'z' => $user->getValue('email')
+			);
+
+		//	$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
 			
-			e107::getLog()->add('USET_08', str_replace($search, $replace, USRLAN_245), E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_08', $tp->lanVars( USRLAN_245,$vars), E_LOG_INFORMATIVE);
 			
 			$this->redirect('list', 'main', true);
 		}
@@ -1022,7 +1055,7 @@ class users_admin_ui extends e_admin_ui
 				$sysuser->email('email', $options);
 				//sendemail($send_to,$subject,$message);
 			}
-			e107::getLog()->add('USET_14', str_replace(array('--UID--','--CLASSES--'), array($id, $svar), UCSLAN_11), E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_14', str_replace(array('[x]','[y]'), array($userid, $svar), UCSLAN_11), E_LOG_INFORMATIVE);
 
             $mes->addSuccess(nl2br($message));
 		}
@@ -1193,7 +1226,9 @@ class users_admin_ui extends e_admin_ui
 		
 		if ($check)
 		{
-			e107::getLog()->add('USET_11', str_replace(array('--ID--','--NAME--','--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_167), E_LOG_INFORMATIVE);
+			$vars = array('x'=> $sysuser->getId(), 'y'=>$sysuser->getName(), 'z'=> $sysuser->getValue('email'));
+			$message = e107::getParser()->lanVars(USRLAN_167,$vars);
+			e107::getLog()->add('USET_11', $message, E_LOG_INFORMATIVE);
 			$mes->addSuccess(USRLAN_140.": <a href='mailto:".$sysuser->getValue('email')."?body=".$return_address."' title=\"".LAN_USER_08."\" >".$sysuser->getName()." (".$sysuser->getValue('email').")</a> ({$lan}) ");
 		}
 		else
@@ -2273,7 +2308,7 @@ class users_admin_ui extends e_admin_ui
 		}
 		if ($del_count)
 		{
-			e107::getLog()->add('USET_13',str_replace('--COUNT--',$del_count,USRLAN_169),E_LOG_INFORMATIVE);
+			e107::getLog()->add('USET_13', e107::getParser()->lanVars(USRLAN_169, $del_count),E_LOG_INFORMATIVE);
 		}
 		if ($tot)
 		{
diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index cca14e552..f78d8570a 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -1988,7 +1988,8 @@ class e_userperms
 		if(!$sysuser->isAdmin())
 		{
 			$sysuser->set('user_admin', 1)->save();
-			$lan = str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_164);
+			$vars = array('x'=>$sysuser->getId(), 'y'=> $sysuser->getName(), 'z'=>$sysuser->getValue('email'));
+			$lan = e107::getParser()->lanVars( USRLAN_164, $vars);
 			e107::getLog()->add('USET_08', $lan, E_LOG_INFORMATIVE);
 		}
 		
diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php
index 3b20de125..a0bbb6a91 100644
--- a/e107_languages/English/admin/lan_mailout.php
+++ b/e107_languages/English/admin/lan_mailout.php
@@ -209,8 +209,8 @@ define("LAN_MAILOUT_191", "Saved emails");
 define("LAN_MAILOUT_192", "Completed Mailshots");
 define("LAN_MAILOUT_193", "Pending Mailshots");
 define("LAN_MAILOUT_194", "Held Mailshots");
-define("LAN_MAILOUT_195", "");
-define("LAN_MAILOUT_196", "");
+// define("LAN_MAILOUT_195", "");
+// define("LAN_MAILOUT_196", "");
 
 // Block of error messages kept together
 define("LAN_MAILOUT_200", "No subject specified");
@@ -296,4 +296,3 @@ define("LAN_MAILOUT_271", "Authentication failed with username ([x]) and passwor
 
 
 
-?>
\ No newline at end of file
diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php
index 58f4607b4..62472ab84 100644
--- a/e107_languages/English/admin/lan_newspost.php
+++ b/e107_languages/English/admin/lan_newspost.php
@@ -182,12 +182,12 @@ define("LAN_NEWS_51", "Modification of the news-item author can be done by:");
 
 define("LAN_NEWS_52", "General Information");
 define("LAN_NEWS_53", "Advanced Options");
-define("LAN_NEWS_54", "stay in edit mode");
+// define("LAN_NEWS_54", "stay in edit mode");
 
 define("LAN_NEWS_55", "Maintenance");				// Was LAN_NEWS_50 in 0.7
-define("LAN_NEWS_56", "Recalculate comment counts");
+//define("LAN_NEWS_56", "Recalculate comment counts");
 define("LAN_NEWS_57", "Proceed");
-define("LAN_NEWS_58", "Update complete - --UPDATE-- comment counts updated, --DELETED-- disallowed comments deleted");
+//define("LAN_NEWS_58", "Update complete - [x] comment counts updated, [y] disallowed comments deleted");
 define("LAN_NEWS_59", "News Maintenance");
 
 define("LAN_NEWS_60", "Comment Total");
diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php
index 0b2458a9c..2747bb124 100644
--- a/e107_languages/English/admin/lan_users.php
+++ b/e107_languages/English/admin/lan_users.php
@@ -159,18 +159,18 @@ define("USRLAN_154", "Clear email for checked");
 define("USRLAN_155", "Total {TOTAL} emails found. {DELCOUNT} deleted through options.<br />{DELUSER} users marked as 'bounced' (out of {FOUND} emails)");
 define("USRLAN_156", "Email address is already in use");
 
-define("USRLAN_160", "Total --COUNT-- users of type --TYPE-- pruned");
-define("USRLAN_161", "User ID --UID-- name --NAME-- banned");
-define("USRLAN_162", "User ID --UID-- name --NAME-- unbanned");
-define("USRLAN_163", "User ID --UID-- deleted");
-define("USRLAN_164", "User ID --UID-- name --NAME-- (--EMAIL--) made admin");
-define("USRLAN_165", "User ID --UID-- name --NAME-- admin status revoked");
-define("USRLAN_166", "User ID --UID-- name --NAME-- approved");
+// define("USRLAN_160", "Total --COUNT-- users of type --TYPE-- pruned");
+define("USRLAN_161", "User ID [x] name [y] banned");
+define("USRLAN_162", "User ID [x] name [y] unbanned");
+// define("USRLAN_163", "User ID --UID-- deleted");
+define("USRLAN_164", "User ID [x] name [y] ([z]) made admin");
+define("USRLAN_165", "User ID [x] name [y] admin status revoked");
+define("USRLAN_166", "User ID [x] name [y] approved");
 //FIX ME USERLAN_160 - USERLAN_166 need to be reworked avoid duplication. 
 
-define("USRLAN_167", "Validation email ID --ID-- resent to --NAME-- at --EMAIL--");
-define("USRLAN_168", "Re-send --COUNT-- validation emails");
-define("USRLAN_169", "Total --COUNT-- bounced emails deleted");
+define("USRLAN_167", "Validation email ID [x] resent to [y] at [z]");
+// define("USRLAN_168", "Re-send --COUNT-- validation emails");
+define("USRLAN_169", "Total [x] bounced emails deleted");
 define("USRLAN_170", "Random user name");
 define("USRLAN_171", "Random password");
 define("USRLAN_172", "User account has been created with the following:");
@@ -264,8 +264,8 @@ define("USRLAN_241", "Activate, Notify (password)");
 define("USRLAN_242", "Require Activation, Notify (password and activation link)");
 
 define("USRLAN_243", "Set Permissions");
-define("USRLAN_244", "Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to remove admin status from --UID-- (--NAME--, --EMAIL--)");
-define("USRLAN_245", "Security violation (not enough permissions) - Administrator --ADMIN_UID-- (--ADMIN_NAME--, --ADMIN_EMAIL--) tried to make --UID-- (--NAME--, --EMAIL--) system admin");
+define("USRLAN_244", "Security violation (not enough permissions) - Administrator [x] ([y], [z]) tried to remove admin status from [u] ([v], [w])");
+define("USRLAN_245", "Security violation (not enough permissions) - Administrator [x] ([y], [z]) tried to make [u] ([v], [w]) system admin");
 define("USRLAN_246", "(Not required)");
 define("USRLAN_247", "Us");
 define("USRLAN_248", "Us");
@@ -289,7 +289,7 @@ define("UCSLAN_7", "Set Classes");
 //define("UCSLAN_8", "Notify User");//incorrect//USRLAN_255
 define("UCSLAN_9", "Classes Updated.");
 define("UCSLAN_10", "Regards,");
-define("UCSLAN_11", "Class membership for user ID --UID-- changed to --CLASSES--");
+define("UCSLAN_11", "Class membership for user ID [x] changed to [y]");
 define("UCSLAN_12", "Member privileges only");