diff --git a/lib/client/chats.js b/lib/client/chats.js
index 7ef4e58..39871f9 100644
--- a/lib/client/chats.js
+++ b/lib/client/chats.js
@@ -2,12 +2,12 @@ define('persona/chats', ['components', 'forum/chats'], function(components, core
 	var Chats = {};
 
 	Chats.init = function() {
-		components.get('chat/recent').off('click').on('click', '[component="chat/recent/room"]', function(e) {
+		components.get('chat/recent').off('click').on('click', 'li', function(e) {
 			var env = utils.findBootstrapEnvironment();
 			if (env === 'xs' || env === 'sm') {
-				app.openChat($(this).attr('data-roomid'));
+				app.openChat($(this).attr('data-username'), $(this).attr('data-uid'));
 			} else {
-				coreChats.switchChat($(this).attr('data-roomid'));
+				coreChats.switchChat(parseInt($(this).attr('data-uid'), 10), $(this).attr('data-username'));
 			}
 		});
 	};
diff --git a/templates/chats.tpl b/templates/chats.tpl
index bc122cd..1925754 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -4,13 +4,12 @@
 <div class="row">
 	<div class="col-md-4">
 		<ul component="chat/recent" class="chats-list" data-nextstart="{nextStart}">
-			<!-- BEGIN rooms -->
-			<div component="chat/recent/room" data-roomid="{rooms.roomId}">
-			<!-- BEGIN rooms.users -->
+			<!-- BEGIN chats -->
 			<!-- IMPORT partials/chat_contact.tpl -->
-			<!-- END rooms.users -->
-			</div>
-			<!-- END rooms -->
+			<!-- END chats -->
+			<!-- BEGIN contacts -->
+			<!-- IMPORT partials/chat_contact.tpl -->
+			<!-- END contacts -->
 		</ul>
 	</div>
 
@@ -20,11 +19,11 @@
 			[[error:chat-restricted]]
 		</div>
 		<!-- ENDIF !allowed -->
-		<!-- IF roomId -->
-		<div component="chat/messages" class="expanded-chat" data-roomid="{roomId}">
+		<!-- IF meta -->
+		<div component="chat/messages" class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
 
 			<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
-			<h1 component="chat/title">{usernames}</h1>
+			<h1 component="chat/title">{meta.username}</h1>
 
 
 			<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
@@ -42,6 +41,6 @@
 		<div class="alert alert-info">
 			[[modules:chat.no-messages]]
 		</div>
-		<!-- ENDIF roomId -->
+		<!-- ENDIF meta -->
 	</div>
 </div>