Merge branch 'release/v13.96' into master

2020-10-07 17:00:10 +02:00
parent 0cf36de463 54336352e2
commit 1291cdc01c
1 changed files with 2 additions and 2 deletions
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3724,8 +3724,8 @@ class UserForm(ModelForm):
                'Please enter a valid email address')

        try:
-            match = User.objects.filter(email__iexact=email)
-            if self.instance in match:
+            match = User.objects.filter(email__iexact=email).exclude(id=self.instance.id)
+            if match.count() == 0:
                return email
        except User.DoesNotExist:
            return email