diff --git a/groups/app_defines.py b/groups/app_defines.py
index 76ade14..b60cccc 100644
--- a/groups/app_defines.py
+++ b/groups/app_defines.py
@@ -1,13 +1,11 @@
 # Group Types
 GROUP_TYPE_BUILTIN = 0
-GROUP_TYPE_PERMISSION = 1
-GROUP_TYPE_CORPORATE = 2
-GROUP_TYPE_MANAGED = 3
+GROUP_TYPE_MANAGED = 1
+GROUP_TYPE_PERMISSION = 2
 
 GROUP_TYPE_CHOICES = (
     (GROUP_TYPE_BUILTIN, 'Built-In'),
     (GROUP_TYPE_PERMISSION, 'Permission'),
-    (GROUP_TYPE_CORPORATE, 'Corporate'),
     (GROUP_TYPE_MANAGED, 'Managed'),
 )
 
diff --git a/groups/migrations/0002_groupinformation.py b/groups/migrations/0002_groupinformation.py
index 1ae6e5b..c045f80 100644
--- a/groups/migrations/0002_groupinformation.py
+++ b/groups/migrations/0002_groupinformation.py
@@ -7,8 +7,11 @@ from django.db import models
 class Migration(DataMigration):
 
     def forwards(self, orm):
-        for group in orm.Group.objects.all():
-            obj = orm.GroupInformation(group=group)
+        for group in orm['auth.Group'].objects.all():
+            try:
+                obj = orm.GroupInformation.objects.get(group=group)
+            except orm['auth.Group'].DoesNotExist:
+                obj = orm.GroupInformation(group=group)
             obj.save()
         
     def backwards(self, orm):
diff --git a/groups/models.py b/groups/models.py
index 0b97d32..0022d48 100644
--- a/groups/models.py
+++ b/groups/models.py
@@ -9,7 +9,7 @@ class GroupInformation(models.Model):
 
     group = models.OneToOneField(Group)
 
-    type = models.IntegerField("Group Type", choices=GROUP_TYPE_CHOICES, default=GROUP_TYPE_BUILTIN)
+    type = models.IntegerField("Group Type", choices=GROUP_TYPE_CHOICES, default=GROUP_TYPE_PERMISSION)
     admins = models.ManyToManyField(User)
     public = models.BooleanField("Public", default=False)
     requestable = models.BooleanField("Requestable", default=False)