diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 7ab0b297..c4c38b17 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -302,6 +302,7 @@ OPENFIRE_ADDRESS = os.environ.get('AA_OPENFIRE_ADDRESS', "http://yourdomain.com:
 OPENFIRE_SECRET_KEY = os.environ.get('AA_OPENFIRE_SECRET_KEY', "somekey")
 BROADCAST_USER = os.environ.get('AA_BROADCAST_USER', "broadcast@") + JABBER_URL
 BROADCAST_USER_PASSWORD = os.environ.get('AA_BROADCAST_USER_PASSWORD', "somepassword")
+BROADCAST_SERVICE_NAME = os.environ.get('AA_BROADCAST_SERVICE_NAME', "broadcast")
 
 ######################################
 # Mumble Configuration
diff --git a/services/managers/openfire_manager.py b/services/managers/openfire_manager.py
index 929394b6..29d4fa73 100755
--- a/services/managers/openfire_manager.py
+++ b/services/managers/openfire_manager.py
@@ -103,27 +103,11 @@ class OpenfireManager:
         client.connect(server=(settings.JABBER_SERVER, settings.JABBER_PORT))
         client.auth(settings.BROADCAST_USER, settings.BROADCAST_USER_PASSWORD, 'broadcast')
 
-        if group_name != 'all':
-            group = Group.objects.get(name=group_name)
-            for user in group.user_set.all():
-                auth_info = AuthServicesInfoManager.get_auth_service_info(user)
-                if auth_info:
-                    if auth_info.jabber_username != "":
-                        to_address = auth_info.jabber_username + '@' + settings.JABBER_URL
-                        message = xmpp.Message(to_address, broadcast_message)
-                        message.setAttr('type', 'chat')
-                        client.send(message)
-                        client.Process(1)
-        else:
-            for user in User.objects.all():
-                auth_info = AuthServicesInfoManager.get_auth_service_info(user)
-                if auth_info:
-                    if auth_info.jabber_username != "":
-                        to_address = auth_info.jabber_username + '@' + settings.JABBER_URL
-                        message = xmpp.Message(to_address, broadcast_message)
-                        message.setAttr('type', 'chat')
-                        client.send(message)
-                        client.Process(1)
+        to_address = group_name + '@' + settings.BROADCAST_SERVICE_NAME + '.' + settings.JABBER_URL
+        message = xmpp.Message(to_address, broadcast_message)
+        message.setAttr('type', 'chat')
+        client.send(message)
+        client.Process(1)
 
         client.disconnect()
 
@@ -138,4 +122,4 @@ class XmppThread (threading.Thread):
     def run(self):
         print "Starting " + self.name
         OpenfireManager.send_broadcast_message(self.group, self.message)
-        print "Exiting " + self.name
\ No newline at end of file
+        print "Exiting " + self.name