diff --git a/circle/dashboard/models.py b/circle/dashboard/models.py
index 003fbd7..c6eec31 100644
--- a/circle/dashboard/models.py
+++ b/circle/dashboard/models.py
@@ -102,7 +102,12 @@ class GroupProfile(AclBase):
     org_id = CharField(
         unique=True, blank=True, null=True, max_length=64,
         help_text=_('Unique identifier of the group at the organization.'))
-    description = TextField()
+    description = TextField(blank=True)
+
+    def save(self, *args, **kwargs):
+        if not self.org_id:
+            self.org_id = None
+        super(GroupProfile, self).save(*args, **kwargs)
 
     @classmethod
     def search(cls, name):