From cdad0b28d49eecb13773c112410f3c126fdd1625 Mon Sep 17 00:00:00 2001
From: Nick Sandford <nick@sandford.id.au>
Date: Thu, 10 Jan 2013 09:05:01 +0100
Subject: [PATCH] Fixed #19573 -- Allow override of username field label in
 AuthenticationForm

---
 django/contrib/auth/forms.py       |  3 ++-
 django/contrib/auth/tests/forms.py | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index 4e2f476cec8..85291126b46 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -169,7 +169,8 @@ class AuthenticationForm(forms.Form):
         # Set the label for the "username" field.
         UserModel = get_user_model()
         self.username_field = UserModel._meta.get_field(UserModel.USERNAME_FIELD)
-        self.fields['username'].label = capfirst(self.username_field.verbose_name)
+        if not self.fields['username'].label:
+            self.fields['username'].label = capfirst(self.username_field.verbose_name)
 
     def clean(self):
         username = self.cleaned_data.get('username')
diff --git a/django/contrib/auth/tests/forms.py b/django/contrib/auth/tests/forms.py
index a9f894905aa..543bb2001dd 100644
--- a/django/contrib/auth/tests/forms.py
+++ b/django/contrib/auth/tests/forms.py
@@ -7,7 +7,7 @@ from django.contrib.auth.forms import (UserCreationForm, AuthenticationForm,
     ReadOnlyPasswordHashWidget)
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core import mail
-from django.forms.fields import Field, EmailField
+from django.forms.fields import Field, EmailField, CharField
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
@@ -138,6 +138,14 @@ class AuthenticationFormTest(TestCase):
         self.assertTrue(form.is_valid())
         self.assertEqual(form.non_field_errors(), [])
 
+    def test_username_field_label(self):
+
+        class CustomAuthenticationForm(AuthenticationForm):
+            username = CharField(label="Name", max_length=75)
+
+        form = CustomAuthenticationForm()
+        self.assertEqual(form['username'].label, "Name")
+
 
 @skipIfCustomUser
 @override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))