diff --git a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee
index 0e73ad92..4fbe8271 100644
--- a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee
+++ b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee
@@ -26,6 +26,7 @@ class Kandan.Broadcasters.FayeBroadcaster
 
 
   processEventsForUser: (eventName, data)->
+    console.log "event:", eventName
     $(document).data('active_users', data.extra.active_users)
     Kandan.Data.ActiveUsers.runCallbacks("change", data)
 
diff --git a/app/models/user_observer.rb b/app/models/user_observer.rb
index 40e90850..fd30ee55 100644
--- a/app/models/user_observer.rb
+++ b/app/models/user_observer.rb
@@ -1,7 +1,9 @@
 class UserObserver < ActiveRecord::Observer
 
   def after_save(user)
-    ActiveUsers.update_user(user) if user.first_name_changed? or user.last_name_changed?
+    if defined?(ActiveUsers)
+      ::ActiveUsers.update_user(user) if user.first_name_changed? or user.last_name_changed?
+    end
   end
   
 end
diff --git a/config/initializers/kandan.rb b/config/initializers/kandan.rb
index 727535bd..ba8d0cf5 100644
--- a/config/initializers/kandan.rb
+++ b/config/initializers/kandan.rb
@@ -8,7 +8,7 @@
 module Kandan
   def self.devise_modules
     standard = [:database_authenticatable, :registerable, :confirmable,
-      :recoverable, :rememberable, :trackable, :validatable]
+      :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable]
     bushido = [:bushido_authenticatable, :trackable, :token_authenticatable]
 
     ::Bushido::Platform.on_bushido? ? bushido : standard
diff --git a/lib/active_users.rb b/lib/active_users.rb
index b1d2b3a0..90d14b3e 100644
--- a/lib/active_users.rb
+++ b/lib/active_users.rb
@@ -47,7 +47,7 @@ def find_by_user_id(user_id)
     def update_user(user)
       if find_by_user_id(user.id)
         @@users[user.id][:user] = user
-        
+        publish_message "update", user
       end
     end
 
@@ -61,7 +61,7 @@ def all
 
     def publish_message(event, user)
       Channel.send("user_#{event}", user) if not event == "update"
-      
+
       FAYE_CLIENT.publish("/app/activities", {
           :event  => "user##{event}",
           :entity => user,