diff --git a/modoboa/extensions/admin/fixtures/demo.json b/modoboa/extensions/admin/fixtures/demo.json
index f1971a053..36ac1cf2f 100644
--- a/modoboa/extensions/admin/fixtures/demo.json
+++ b/modoboa/extensions/admin/fixtures/demo.json
@@ -1 +1,304 @@
-[{"pk": 1, "model": "core.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": false, "last_login": "2012-05-03T16:58:51+01:00", "groups": [], "user_permissions": [], "password": "{CRYPT}dTTsGDkA5ZHKg", "email": "", "date_joined": "2012-01-26T15:19:25+01:00"}}, {"pk": 2, "model": "core.user", "fields": {"username": "admin@demo.local", "first_name": "Demo", "last_name": "Administrator", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2012-05-24T05:00:12+01:00", "groups": [1], "user_permissions": [], "password": "{CRYPT}SJ2bQWwabfH/6", "email": "admin@demo.local", "date_joined": "2012-05-03T16:50:15+01:00"}}, {"pk": 4, "model": "core.user", "fields": {"username": "user@demo.local", "first_name": "Demo", "last_name": "User", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2012-05-03T16:56:50+01:00", "groups": [2], "user_permissions": [], "password": "{CRYPT}2iAFXtxUA6.7Y", "email": "user@demo.local", "date_joined": "2012-05-03T16:56:50+01:00"}}, {"pk": 2, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 3, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["core", "user"], "object_id": 2}}, {"pk": 4, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 5, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 6, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 7, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 8, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["core", "user"], "object_id": 2}}, {"pk": 9, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 13, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["core", "user"], "object_id": 4}}, {"pk": 14, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 15, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 16, "model": "core.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["core", "user"], "object_id": 4}}, {"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2012-05-03T16:49:40+01:00", "last_modification": "2012-05-03T16:49:40+01:00"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2012-05-03T16:50:15+01:00", "last_modification": "2012-05-03T16:50:36+01:00"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2012-05-03T16:50:15+01:00", "last_modification": "2012-05-03T16:50:15+01:00"}}, {"pk": 4, "model": "admin.objectdates", "fields": {"creation": "2012-05-03T16:51:04+01:00", "last_modification": "2012-05-03T16:51:04+01:00"}}, {"pk": 5, "model": "admin.objectdates", "fields": {"creation": "2012-05-03T16:56:50+01:00", "last_modification": "2012-05-03T16:56:50+01:00"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "quota": 10, "user": 2, "domain": 1, "address": "admin"}}, {"pk": 3, "model": "admin.mailbox", "fields": {"dates": 5, "quota": 10, "user": 4, "domain": 1, "address": "user"}}, {"pk": 1, "model": "admin.alias", "fields": {"dates": 3, "enabled": true, "domain": 1, "mboxes": [1], "address": "postmaster", "extmboxes": ""}}, {"pk": 1, "model": "core.extension", "fields": {"enabled": true, "name": "limits"}}, {"pk": 2, "model": "core.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 3, "model": "core.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 4, "model": "core.extension", "fields": {"enabled": true, "name": "amavis"}}, {"pk": 5, "model": "core.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 6, "model": "core.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 7, "model": "core.extension", "fields": {"enabled": true, "name": "postfix_relay_domains"}}, {"pk": "admin@demo.local", "model": "admin.quota", "fields": {"mbox": 1, "username": "admin@demo.local", "bytes": 0, "messages": 0}}, {"pk": "user@demo.local", "model": "admin.quota", "fields": {"mbox": 3, "username": "user@demo.local", "bytes": 0, "messages": 0}}]
+[
+    {
+        "pk": 1,
+        "model": "core.user",
+        "fields": {
+            "username": "admin",
+            "first_name": "",
+            "last_name": "",
+            "is_active": true,
+            "is_superuser": true,
+            "is_staff": false,
+            "last_login": "2012-05-03T16:58:51+01:00", 
+            "groups": [],
+            "user_permissions": [],
+            "password": "{CRYPT}dTTsGDkA5ZHKg",
+            "email": "",
+            "date_joined": "2012-01-26T15:19:25+01:00"
+        }
+    },
+    {
+        "pk": 2,
+        "model": "core.user",
+        "fields": {
+            "username": "admin@demo.local",
+            "first_name": "Demo",
+            "last_name": "Administrator",
+            "is_active": true,
+            "is_superuser": false,
+            "is_staff": false,
+            "last_login": "2012-05-24T05:00:12+01:00",
+            "groups": [1],
+            "user_permissions": [],
+            "password": "{CRYPT}SJ2bQWwabfH/6",
+            "email": "admin@demo.local",
+            "date_joined": "2012-05-03T16:50:15+01:00"
+        }
+    },
+    {
+        "pk": 4,
+        "model": "core.user",
+        "fields": {
+            "username": "user@demo.local",
+            "first_name": "Demo", "last_name": "User",
+            "is_active": true,
+            "is_superuser": false,
+            "is_staff": false,
+            "last_login": "2012-05-03T16:56:50+01:00",
+            "groups": [2],
+            "user_permissions": [],
+            "password": "{CRYPT}2iAFXtxUA6.7Y",
+            "email": "user@demo.local",
+            "date_joined": "2012-05-03T16:56:50+01:00"
+        }
+    },
+    {
+        "pk": 2,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["admin", "domain"],
+            "object_id": 1
+        }
+    },
+    {
+        "pk": 3,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["core", "user"],
+            "object_id": 2
+        }
+    },
+    {
+        "pk": 4,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["admin", "mailbox"],
+            "object_id": 1
+        }
+    },
+    {
+        "pk": 5,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["admin", "alias"],
+            "object_id": 1
+        }
+    },
+    {
+        "pk": 6,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["admin", "domain"],
+            "object_id": 1
+        }
+    },
+    {
+        "pk": 7,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["admin", "mailbox"],
+            "object_id": 1
+        }
+    },
+    {
+        "pk": 8,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["core", "user"],
+            "object_id": 2
+        }
+    },
+    {
+        "pk": 9,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["admin",
+                             "alias"],
+            "object_id": 1}},
+    {
+        "pk": 13,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["core",
+                             "user"],
+            "object_id": 4}},
+    {
+        "pk": 14,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": true,
+            "user": 1,
+            "content_type": ["admin",
+                             "mailbox"],
+            "object_id": 3}},
+    {
+        "pk": 15,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["admin",
+                             "mailbox"],
+            "object_id": 3}},
+    {
+        "pk": 16,
+        "model": "core.objectaccess",
+        "fields": {
+            "is_owner": false,
+            "user": 2,
+            "content_type": ["core",
+                             "user"],
+            "object_id": 4}},
+    {
+        "pk": 1,
+        "model": "admin.objectdates",
+        "fields": {
+            "creation": "2012-05-03T16:49:40+01:00",
+            "last_modification": "2012-05-03T16:49:40+01:00"}},
+    {
+        "pk": 2,
+        "model": "admin.objectdates",
+        "fields": {
+            "creation": "2012-05-03T16:50:15+01:00",
+            "last_modification": "2012-05-03T16:50:36+01:00"}},
+    {
+        "pk": 3,
+        "model": "admin.objectdates",
+        "fields": {
+            "creation": "2012-05-03T16:50:15+01:00",
+            "last_modification": "2012-05-03T16:50:15+01:00"}},
+    {
+        "pk": 4,
+        "model": "admin.objectdates",
+        "fields": {
+            "creation": "2012-05-03T16:51:04+01:00",
+            "last_modification": "2012-05-03T16:51:04+01:00"}},
+    {
+        "pk": 5,
+        "model": "admin.objectdates",
+        "fields": {
+            "creation": "2012-05-03T16:56:50+01:00",
+            "last_modification": "2012-05-03T16:56:50+01:00"}},
+    {
+        "pk": 1,
+        "model": "admin.domain",
+        "fields": {
+            "dates": 1,
+            "enabled": true,
+            "name": "demo.local",
+            "quota": 10}},
+    {
+        "pk": 1,
+        "model": "admin.mailbox",
+        "fields": {
+            "dates": 2,
+            "quota": 10,
+            "user": 2,
+            "domain": 1,
+            "address": "admin",
+            "quota_value": "admin@demo.local"
+        }
+    },
+    {
+        "pk": 3,
+        "model": "admin.mailbox",
+        "fields": {
+            "dates": 5,
+            "quota": 10,
+            "user": 4,
+            "domain": 1,
+            "address": "user",
+            "quota_value": "user@demo.local"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "admin.alias",
+        "fields": {
+            "dates": 3,
+            "enabled": true,
+            "domain": 1,
+            "mboxes": [1],
+            "address": "postmaster",
+            "extmboxes": ""}},
+    {
+        "pk": 1,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "limits"}},
+    {
+        "pk": 2,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "postfix_autoreply"}},
+    {
+        "pk": 3,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "stats"}},
+    {
+        "pk": 4,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "amavis"}},
+    {
+        "pk": 5,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "webmail"}},
+    {
+        "pk": 6,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "sievefilters"}},
+    {
+        "pk": 7,
+        "model": "core.extension",
+        "fields": {
+            "enabled": true,
+            "name": "postfix_relay_domains"
+        }
+    },
+    {
+        "pk": "admin@demo.local",
+        "model": "admin.quota",
+        "fields": {
+            "username": "admin@demo.local",
+            "bytes": 0,
+            "messages": 0
+        }
+    },
+    {
+        "pk": "user@demo.local",
+        "model": "admin.quota",
+        "fields": {
+            "username": "user@demo.local",
+            "bytes": 0,
+            "messages": 0
+        }
+    }
+]