diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8307437..1ced26c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* :bug:`-` fix broken mailbox admin
+
 * :release:`0.2.3 <2014-12-26>`
 * :bug:`-` remove attribute readonly_fields from
   :py:class:`osusers.admin.UserAdmin` to make saving of additional groups work
diff --git a/gnuviechadmin/managemails/admin.py b/gnuviechadmin/managemails/admin.py
index d74fcba..aea5995 100644
--- a/gnuviechadmin/managemails/admin.py
+++ b/gnuviechadmin/managemails/admin.py
@@ -113,12 +113,12 @@ class MailboxAdmin(ActivationChangeMixin, admin.ModelAdmin):
     list_filter = ('active',)
     fieldsets = (
         (None, {
-            'fields': ('username', 'password', 'osuser', 'active')}),
+            'fields': ('osuser', 'username', 'password', 'active')}),
     )
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('username', 'password1', 'password2')}),
+            'fields': ('osuser', 'username', 'password1', 'password2')}),
     )
     search_fields = ('username',)
     ordering = ('username',)