Merge pull request #58 from laginha/master

fix issue #27
macropin · May 16, 2015 · c73536c · c73536c
2 parents 998cddf + 88c10f1
commit c73536c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/registration/forms.py b/registration/forms.py
@@ -16,6 +16,7 @@
 
 from registration.users import UserModel
 
+User = UserModel()
 
 class RegistrationForm(UserCreationForm):
     """
@@ -34,8 +35,8 @@ class RegistrationForm(UserCreationForm):
     email = forms.EmailField(label=_("E-mail"))
 
     class Meta:
-        model  = UserModel()
-        fields = ("username", "email")
+        model  = User
+        fields = (getattr(User, 'USERNAME_FIELD', 'username'), "email")
 
 
 class RegistrationFormTermsOfService(RegistrationForm):
@@ -61,7 +62,7 @@ def clean_email(self):
         site.
 
         """
-        if UserModel().objects.filter(email__iexact=self.cleaned_data['email']):
+        if User.objects.filter(email__iexact=self.cleaned_data['email']):
             raise forms.ValidationError(_("This email address is already in use. Please supply a different email address."))
         return self.cleaned_data['email']