diff --git a/app/sso/services/jabber/__init__.py b/app/sso/services/jabber/__init__.py
index c458d39..76884ed 100644
--- a/app/sso/services/jabber/__init__.py
+++ b/app/sso/services/jabber/__init__.py
@@ -108,13 +108,15 @@ class JabberService(BaseService):
         valid_groups = []
 
         for group in groups:
-            groupname = group.name.lower().replace(' ', '-')
-            self.exec_xmlrpc('srg_create', group=groupname, host=server, name=group.name, description='', display='')
-            self.exec_xmlrpc('srg_user_add', user=username, host=server, group=groupname, grouphost=server)
-            valid_groups.append(groupname)
+            if not group.name in current_groups:
+                groupname = group.name.lower().replace(' ', '-').replace('.', '')
+                self.exec_xmlrpc('srg_create', group=groupname, host=server, name=group.name, description='', display='')
+                self.exec_xmlrpc('srg_user_add', user=username, host=server, group=groupname, grouphost=server)
+                if not groupname in current_groups: current_groups.append(groupname)
+            if not groupname in valid_groups: valid_groups.append(groupname)
 
         for group in (set(current_groups) - set(valid_groups)):
-            self.exec_xmlrpc('srg_user_del', user=username, host=server, group=groupname, grouphost=server)
+            self.exec_xmlrpc('srg_user_del', user=username, host=server, group=group, grouphost=server)
 
     def send_message(self, jid, msg):
         # send_stanza_c2s user host resource stanza
diff --git a/app/sso/tasks.py b/app/sso/tasks.py
index be5a004..a008a4c 100644
--- a/app/sso/tasks.py
+++ b/app/sso/tasks.py
@@ -89,7 +89,9 @@ def update_service_groups(user_id):
     for service in ServiceAccount.objects.filter(user=user_id, active=True).select_related('service__api'):
         api = service.service.api_class
         try:
+            print "Updating %s" % service
             api.update_groups(service.service_uid, service.user.groups.all(), service.character)
+            print "Done"
         except:
             print "Error updating %s %s" % (service.service, service.service_uid)
             pass