diff --git a/rowers/models.py b/rowers/models.py
index 97cad63b..93dcfa58 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3201,23 +3201,6 @@ class AccountRowerForm(ModelForm):
         if self.instance.rowerplan != 'coach':
             self.fields.pop('offercoaching')
 
-    def clean_email(self):
-        email = self.cleaned_data.get('email')
-
-        try:
-            validate_email(email)
-        except ValidationError:
-            raise forms.ValidationError(
-                'Please enter a valid email address')
-            
-        try:
-            match = User.objects.get(email__iexact=email)
-            if self.instance.user == match:
-                return email
-        except User.DoesNotExist:
-            return email
-
-        raise forms.ValidationError('This email address is not allowed')
         
         
 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 5ba2851f..f63def67 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 06540e41..c80e7ab8 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -178,7 +178,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
 
 
     if request.method == 'POST':
-        accountform = AccountRowerForm(request.POST)
+        accountform = AccountRowerForm(request.POST, instance=r)
         userform = UserForm(request.POST,instance=r.user)
 
         if accountform.is_valid() and userform.is_valid():