diff --git a/app/models/user.rb b/app/models/user.rb
index 0cebf9ef..a7e887ad 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -22,7 +22,7 @@ class User
 
   validates_uniqueness_of :email
   before_save :ensure_authentication_token
-  
+
   has_many :error_logs
 
   view :by_authentication_token, key: :authentication_token
diff --git a/config/initializers/mozo_settings.rb b/config/initializers/mozo_settings.rb
index 246e6b44..b5b9ae5d 100644
--- a/config/initializers/mozo_settings.rb
+++ b/config/initializers/mozo_settings.rb
@@ -1,4 +1,4 @@
-Qwaiter.event_host = "http://#{Rails.env.development? ? 'localhost' : 'events.mozo.bar'}:9296/faye"
+Qwaiter.event_host = "http://#{Rails.env.development? or Rails.env.test? ? 'localhost' : 'events.mozo.bar'}:9296/faye"
 Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new
 
 # use the connection from couchbase-structures/documents
diff --git a/faye/config.ru b/faye/config.ru
index bb391d50..e85542f0 100644
--- a/faye/config.ru
+++ b/faye/config.ru
@@ -1,12 +1,12 @@
 require 'faye'
+require 'pry'
 #require File.expand_path('../config/initializers/faye_token.rb', __FILE__)
 setproctitle('mozo_faye') if respond_to?(:setproctitle)
+VALID_TOKENS = ['6be65f9b5e7d21b8ca8de4ccfad5ba24cf40d440b370af79']
 class ServerAuth
   def incoming(message, callback)
     if message['channel'] !~ %r{^/meta/}
-      if false && message['ext']['auth_token'] != FAYE_TOKEN
-        message['error'] = 'Invalid authentication token'
-      end
+      message['error'] = 'Invalid authentication token' unless message['ext'] && VALID_TOKENS.include?(message['ext']['auth_token'])
     end
     callback.call(message)
   end
diff --git a/lib/qwaiter/broadcaster/faye.rb b/lib/qwaiter/broadcaster/faye.rb
index e69b32e0..dff531a3 100644
--- a/lib/qwaiter/broadcaster/faye.rb
+++ b/lib/qwaiter/broadcaster/faye.rb
@@ -3,7 +3,7 @@ module Qwaiter
     class Faye
       def broadcast(message)
         @uri ||= URI.parse(Qwaiter.event_host)
-        Net::HTTP.post_form(@uri, :message => message.to_json)
+        Net::HTTP.post_form(@uri, message: message.merge(ext: {auth_token: '6be65f9b5e7d21b8ca8de4ccfad5ba24cf40d440b370af79'}).to_json)
       end
     end
   end