Index: contrib/auth/models.py
===================================================================
--- contrib/auth/models.py	(revision 6820)
+++ contrib/auth/models.py	(working copy)
@@ -96,10 +96,10 @@
     class Meta:
         verbose_name = _('group')
         verbose_name_plural = _('groups')
-        ordering = ('name',)
 
     class Admin:
         search_fields = ('name',)
+        ordering = ('name',)
 
     def __unicode__(self):
         return self.name
@@ -146,7 +146,6 @@
     class Meta:
         verbose_name = _('user')
         verbose_name_plural = _('users')
-        ordering = ('username',)
 
     class Admin:
         fields = (
@@ -159,6 +158,7 @@
         list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
         list_filter = ('is_staff', 'is_superuser')
         search_fields = ('username', 'first_name', 'last_name', 'email')
+        ordering = ('username',)
 
     def __unicode__(self):
         return self.username