diff --git a/opentech/apply/users/forms.py b/opentech/apply/users/forms.py
index 2a2b97ffcfe5217a8544f1e198fa3b9afe893684..9a19eb4da9c6690d0a54bffc7ceb665218210a65 100644
--- a/opentech/apply/users/forms.py
+++ b/opentech/apply/users/forms.py
@@ -5,22 +5,17 @@ from wagtail.wagtailusers.forms import UserEditForm, UserCreationForm
 
 
 class CustomUserEditForm(UserEditForm):
-    full_name = forms.CharField(label=_("Full name"), required=True)
-
     def __init__(self, *args, **kwargs):
-        super(CustomUserEditForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # HACK: Wagtail admin doesn't work with custom User models that do not have first/last name.
-        self.fields['first_name'].widget = forms.HiddenInput(attrs={'value': f"fn{self.instance.pk}"})
-        self.fields['last_name'].widget = forms.HiddenInput(attrs={'value': f"ln{self.instance.pk}"})
-
+        self.fields['first_name'].widget = forms.HiddenInput(attrs={'value': f"Not used - see full_name"})
+        self.fields['last_name'].widget = forms.HiddenInput(attrs={'value': f"Not used - see full_name"})
 
 class CustomUserCreationForm(UserCreationForm):
-    full_name = forms.CharField(label=_("Full name"), required=True)
-
     def __init__(self, *args, **kwargs):
-        super(CustomUserCreationForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # HACK: Wagtail admin doesn't work with custom User models that do not have first/last name.
-        self.fields['first_name'].widget = forms.HiddenInput(attrs={'value': f"fn{self.instance.pk}"})
-        self.fields['last_name'].widget = forms.HiddenInput(attrs={'value': f"ln{self.instance.pk}"})
+        self.fields['first_name'].widget = forms.HiddenInput(attrs={'value': f"Not used - see full_name"})
+        self.fields['last_name'].widget = forms.HiddenInput(attrs={'value': f"Not used - see full_name"})
diff --git a/opentech/apply/users/models.py b/opentech/apply/users/models.py
index e9e4b96f171f14b5f85f00aabf121d91637dc02e..1ab13471d2e7e45a79317063e9bfc0a1d5078720 100644
--- a/opentech/apply/users/models.py
+++ b/opentech/apply/users/models.py
@@ -76,10 +76,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     def __str__(self):
         return self.get_full_name()
 
-    def clean(self):
-        super().clean()
-        self.email = self.__class__.objects.normalize_email(self.email)
-
     def get_full_name(self):
         return self.full_name.strip()