diff --git a/allianceauth/groupmanagement/admin.py b/allianceauth/groupmanagement/admin.py
index 37fa1e37..14a1d569 100644
--- a/allianceauth/groupmanagement/admin.py
+++ b/allianceauth/groupmanagement/admin.py
@@ -40,9 +40,6 @@ class AuthGroupInlineAdmin(admin.StackedInline):
             kwargs["queryset"] = Group.objects.order_by(Lower('name'))
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
-    def has_add_permission(self, request, obj=None):
-        return False
-
     def has_delete_permission(self, request, obj=None):
         return False
 
@@ -173,6 +170,13 @@ class GroupAdmin(admin.ModelAdmin):
             kwargs["queryset"] = Permission.objects.select_related("content_type").all()
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
+    def save_formset(self, request, form, formset, change):
+        for inline_form in formset:
+            ag_instance = inline_form.save(commit=False)
+            ag_instance.group = form.instance
+            ag_instance.save()
+        formset.save()
+
 
 class Group(BaseGroup):
     class Meta:
diff --git a/allianceauth/groupmanagement/models.py b/allianceauth/groupmanagement/models.py
index 861872ef..2388283b 100644
--- a/allianceauth/groupmanagement/models.py
+++ b/allianceauth/groupmanagement/models.py
@@ -55,7 +55,6 @@ class RequestLog(models.Model):
         return user.profile.main_character
 
 
-
 class AuthGroup(models.Model):
     """
     Extends Django Group model with a one-to-one field
@@ -107,7 +106,8 @@ class AuthGroup(models.Model):
                                     help_text="States listed here will have the ability to join this group provided "
                                               "they have the proper permissions.")
 
-    description = models.TextField(max_length=512, blank=True, help_text="Short description <i>(max. 512 characters)</i> of the group shown to users.")
+    description = models.TextField(max_length=512, blank=True, help_text="Short description <i>(max. 512 characters)"
+                                                                         "</i> of the group shown to users.")
 
     def __str__(self):
         return self.group.name
@@ -117,20 +117,3 @@ class AuthGroup(models.Model):
             ("request_groups", u"Can request non-public groups"),
         )
         default_permissions = tuple()
-
-
-@receiver(post_save, sender=Group)
-def create_auth_group(sender, instance, created, **kwargs):
-    """
-    Creates the AuthGroup model when a group is created
-    """
-    if created:
-        AuthGroup.objects.create(group=instance)
-
-
-@receiver(post_save, sender=Group)
-def save_auth_group(sender, instance, **kwargs):
-    """
-    Ensures AuthGroup model is saved automatically
-    """
-    instance.authgroup.save()