diff --git a/acptemplates/commandTriggerList.tpl b/acptemplates/commandTriggerList.tpl
index 07fac70..a36fe23 100644
--- a/acptemplates/commandTriggerList.tpl
+++ b/acptemplates/commandTriggerList.tpl
@@ -46,7 +46,7 @@
 					<tr class="jsTriggerRow">
 						<td class="columnIcon">
 							<a href="{link controller='CommandTriggerEdit' object=$trigger application='chat'}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$trigger->triggerID}" data-confirm-message-html="{lang __encode=true}chat.acp.command.trigger.delete.sure{/lang}"></span>
+							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{$trigger->triggerID}" data-confirm-message-html="{lang __encode=true}chat.acp.command.trigger.delete.sure{/lang}"></span>
 
 							{event name='rowButtons'}
 						</td>
diff --git a/acptemplates/roomList.tpl b/acptemplates/roomList.tpl
index fa9613c..518ce2d 100644
--- a/acptemplates/roomList.tpl
+++ b/acptemplates/roomList.tpl
@@ -37,14 +37,14 @@
 		<ol id="roomContainer0" class="sortableList" data-object-id="0">
 			{content}
 				{foreach from=$objects item=room}
-					<li class="sortableNode sortableNoNesting" data-object-id="{@$room->roomID}">
+					<li class="sortableNode sortableNoNesting" data-object-id="{$room->roomID}">
 						<span class="sortableNodeLabel">
 							<a href="{link controller='RoomEdit' application='chat' object=$room}{/link}">{$room}</a>
 
 							<span class="statusDisplay sortableButtonContainer">
 								<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 								<a href="{link controller='RoomEdit' application='chat' object=$room}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$room->roomID}" data-confirm-message-html="{lang __encode=true}chat.acp.room.delete.sure{/lang}"></span>
+								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{$room->roomID}" data-confirm-message-html="{lang __encode=true}chat.acp.room.delete.sure{/lang}"></span>
 								{event name='itemButtons'}
 							</span>
 						</span>
diff --git a/templates/messageTypes.tpl b/templates/messageTypes.tpl
index 6641b43..34147fa 100644
--- a/templates/messageTypes.tpl
+++ b/templates/messageTypes.tpl
@@ -87,7 +87,7 @@
 				<ol class="containerList">
 					<li>
 						<div class="box48">
-							<a href="{$users.get($message.payload.user.userID).link}" title="{@$users.get($message.payload.user.userID).username}">
+							<a href="{$users.get($message.payload.user.userID).link}" title="{$users.get($message.payload.user.userID).username}">
 								{@$users.get($message.payload.user.userID).image48}
 							</a>
 							<div>
diff --git a/templates/room.tpl b/templates/room.tpl
index 48e6316..ca891cb 100644
--- a/templates/room.tpl
+++ b/templates/room.tpl
@@ -22,7 +22,7 @@
 	</a>
 {/capture}
 
-{capture assign='__pageDataAttributes'}data-room-id="{@$room->roomID}"{/capture}
+{capture assign='__pageDataAttributes'}data-room-id="{$room->roomID}"{/capture}
 
 {include file='header'}
 
diff --git a/templates/userList.tpl b/templates/userList.tpl
index 2a3c916..b1798e4 100644
--- a/templates/userList.tpl
+++ b/templates/userList.tpl
@@ -6,7 +6,7 @@
 				<a href="{$user.link}">{@$user.image24}</a>
 
 				<div class="sidebarItemTitle">
-					<h3><a href="{@$user.link}" data-user-id="{@$user.userID}">{@$user.formattedUsername}</a></h3>
+					<h3><a href="{$user.link}" data-user-id="{$user.userID}">{@$user.formattedUsername}</a></h3>
 				</div>
 
 				<div class="iconColumn">