diff --git a/app/assets/javascripts/wait.js b/app/assets/javascripts/wait.js
index 2bb91d21..f538954c 100644
--- a/app/assets/javascripts/wait.js
+++ b/app/assets/javascripts/wait.js
@@ -22,9 +22,24 @@ $(document).on("turbolinks:load", function(){
   if(controller == "rooms" && action == "join"){
     App.waiting = App.cable.subscriptions.create({
       channel: "WaitingChannel",
-      uid: $(".background").attr("room")
+      roomuid: $(".background").attr("room"),
+      useruid: $(".background").attr("user")
     }, {
+      connected: function() {
+        console.log("connected");
+      },
+
+      disconnected: function(data) {
+        console.log("disconnected");
+        console.log(data);
+      },
+
+      rejected: function() {
+        console.log("rejected");
+      },
+
       received: function(data){
+        console.log(data);
         if(data.action = "started"){
           request_to_join_meeting();
         }
diff --git a/app/channels/waiting_channel.rb b/app/channels/waiting_channel.rb
index d123e7fc..0d5e3272 100644
--- a/app/channels/waiting_channel.rb
+++ b/app/channels/waiting_channel.rb
@@ -18,6 +18,11 @@
 
 class WaitingChannel < ApplicationCable::Channel
   def subscribed
-    stream_from "#{params[:uid]}_waiting_channel"
+    Rails.logger.info "subscribed [#{params[:useruid]}:#{params[:roomuid]}]"
+    stream_from "#{params[:roomuid]}_waiting_channel"
+  end
+
+  def unsubscribed
+    Rails.logger.info "unsubscribed [#{params[:useruid]}:#{params[:roomuid]}]"
   end
 end
diff --git a/app/views/shared/_room_event.html.erb b/app/views/shared/_room_event.html.erb
index 88a29f1c..bf01835c 100644
--- a/app/views/shared/_room_event.html.erb
+++ b/app/views/shared/_room_event.html.erb
@@ -13,7 +13,7 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
 
-<div class="background pb-9" room="<%= @room.uid %>" join-name="<%= @join_name %>">
+<div class="background pb-9" room="<%= @room.uid %>" user="<%= current_user ? current_user.uid : "anonymous" %>" join-name="<%= @join_name %>">
   <div class="container">
     <div class="row pt-9">
       <div class="col-lg-12 col-sm-12">
diff --git a/config/application.rb b/config/application.rb
index 839f8dda..7b804402 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -138,5 +138,11 @@ module Greenlight
 
     # Default admin password
     config.admin_password_default = ENV['ADMIN_PASSWORD'] || 'administrator'
+
+    config.action_cable.log_tags = [
+      ->(request) { request.session['user_id'] || "no-account" },
+      :action_cable,
+      ->(request) { request.uuid }
+    ]
   end
 end