6 files changed, 8 insertions, 6 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index b61b0441f8..0f82ded185 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -76,6 +76,10 @@ class AdminForm(object):
         for fieldset in self.fieldsets:
             yield BoundFieldset(self.form, fieldset)
 
+    def first_field(self):
+        for bf in self.form:
+            return bf
+
 class Fieldset(object):
     def __init__(self, name=None, fields=(), classes=(), description=None):
         self.name, self.fields = name, fields
diff --git a/django/contrib/admin/templates/admin/auth/user/add_form.html b/django/contrib/admin/templates/admin/auth/user/add_form.html
index 139fa6a75e..d478ec7710 100644
--- a/django/contrib/admin/templates/admin/auth/user/add_form.html
+++ b/django/contrib/admin/templates/admin/auth/user/add_form.html
@@ -24,5 +24,7 @@
   <p class="help">{% trans 'Enter the same password as above, for verification.' %}</p>
 </div>
 
+<script type="text/javascript">document.getElementById("id_username").focus();</script>
+
 </fieldset>
 {% endblock %}
diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html
index 3d359ecf8f..acefebcf4b 100644
--- a/django/contrib/admin/templates/admin/auth/user/change_password.html
+++ b/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -46,7 +46,7 @@
 <input type="submit" value="{% trans 'Change password' %}" class="default" />
 </div>
 
-<script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script>
+<script type="text/javascript">document.getElementById("id_password1").focus();</script>
 </div>
 </form></div>
 {% endblock %}
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index 23c02fdb86..3a2170839e 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -79,7 +79,7 @@
 {% submit_row %}
 
 {% if add %}
-   <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script>
+   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
 {% endif %}
 
 {% if auto_populated_fields %}
diff --git a/django/contrib/admin/views/auth.py b/django/contrib/admin/views/auth.py
index bea1f8533c..95e72fc511 100644
--- a/django/contrib/admin/views/auth.py
+++ b/django/contrib/admin/views/auth.py
@@ -38,7 +38,6 @@ def user_add_stage(request):
         'has_absolute_url': False,
         'auto_populated_fields': (),
         'bound_field_sets': (),
-        'first_form_field_id': 'id_username',
         'opts': User._meta,
         'username_help_text': User._meta.get_field('username').help_text,
     }, context_instance=template.RequestContext(request))
@@ -69,7 +68,6 @@ def user_change_password(request, id):
         'has_delete_permission': False,
         'has_change_permission': True,
         'has_absolute_url': False,
-        'first_form_field_id': 'id_password1',
         'opts': User._meta,
         'original': user,
         'show_save': True,
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index ad5823f70e..bca0089084 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -173,7 +173,6 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
     field_sets = model_admin.get_field_sets()
     original = getattr(manipulator, 'original_object', None)
     bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets]
-    first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id();
     ordered_objects = opts.get_ordered_objects()
     inline_related_objects = opts.get_followed_related_objects(manipulator.follow)
     extra_context = {
@@ -185,7 +184,6 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
         'has_absolute_url': hasattr(model, 'get_absolute_url'),
         'auto_populated_fields': auto_populated_fields,
         'bound_field_sets': bound_field_sets,
-        'first_form_field_id': first_form_field_id,
         'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets),
         'ordered_objects': ordered_objects,
         'inline_related_objects': inline_related_objects,