diff --git a/include/chat.php b/include/chat.php
index 8011fdb5b..9d90f7970 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -121,8 +121,9 @@ function chatroom_leave($observer_xchan,$room_id,$status) {
 
 function chatroom_list($uid) {
 
-	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d order by cr_name group by cp_id",
+	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d  group by cp_id order by cr_name",
 		intval($uid)
 	);
+
 	return $r;
 }
\ No newline at end of file
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
index 34050eef3..d2cf4d7b0 100644
--- a/view/tpl/chatroomlist.tpl
+++ b/view/tpl/chatroomlist.tpl
@@ -1,10 +1,10 @@
 <div class="widget">
 <h3>{{$header}}</h3>
-{{$if $items}}
+{{if $items}}
 <table>
-{{for $items as $item}}
+{{foreach $items as $item}}
 <tr><td>{{$item.cr_name}}</td><td>{{$item.cr_inroom}}</td></tr>
-{{/for}}
+{{/foreach}}
 </table>
 {{/if}}
 </div>