diff --git a/club/models.py b/club/models.py
index 9c1a1275..087c7402 100644
--- a/club/models.py
+++ b/club/models.py
@@ -3,6 +3,7 @@ from django.core import validators
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
+from django.db import IntegrityError
 from django.core.urlresolvers import reverse
 
 from core.models import User, MetaGroup, Group
@@ -50,8 +51,12 @@ class Club(models.Model):
 
     def save(self):
         super(Club, self).save()
-        MetaGroup(name=self.unix_name+settings.SITH_BOARD_SUFFIX).save()
-        MetaGroup(name=self.unix_name+settings.SITH_MEMBER_SUFFIX).save()
+        try:
+            MetaGroup(name=self.unix_name+settings.SITH_BOARD_SUFFIX).save()
+            MetaGroup(name=self.unix_name+settings.SITH_MEMBER_SUFFIX).save()
+        except IntegrityError as e:
+            # Groups already exists
+            pass
 
     def __str__(self):
         return self.name
diff --git a/club/views.py b/club/views.py
index 750f3c0a..0431f0c5 100644
--- a/club/views.py
+++ b/club/views.py
@@ -94,6 +94,6 @@ class ClubEditPropView(CanEditPropMixin, UpdateView):
     """
     model = Club
     pk_url_kwarg = "club_id"
-    fields = ['name', 'parent']
+    fields = ['name', 'unix_name', 'parent']
     template_name = 'club/club_edit_prop.jinja'