Merge pull request #4738 from kobotoolbox/allauth-admin

Don't prevent users from saving an existing social application due to provider ID validation

kobo/apps/django_allauth/admin.py

@@ -32,7 +32,7 @@ def clean_provider_id(self):
         if SocialApp.objects.filter(
             Q(provider_id=provider_id) |
             Q(provider=provider_id)
-        ).exists():
+        ).exclude(pk=self.instance.pk).exists():
             raise ValidationError(
                 """The Provider ID value must be unique and cannot match an existing Provider name.
                 Please use a different value."""