diff --git a/admin/fixtures/demo.json b/admin/fixtures/demo.json
index 4e706b160..69363e796 100644
--- a/admin/fixtures/demo.json
+++ b/admin/fixtures/demo.json
@@ -1 +1 @@
-[{"pk": 75, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": ["admin", "alias"]}}, {"pk": 76, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": ["admin", "alias"]}}, {"pk": 77, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": ["admin", "alias"]}}, {"pk": 78, "model": "auth.permission", "fields": {"codename": "view_aliases", "name": "View aliases", "content_type": ["admin", "alias"]}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "add_domain", "name": "Can add domain", "content_type": ["admin", "domain"]}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "change_domain", "name": "Can change domain", "content_type": ["admin", "domain"]}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "delete_domain", "name": "Can delete domain", "content_type": ["admin", "domain"]}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "view_domain", "name": "View domain", "content_type": ["admin", "domain"]}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "view_domains", "name": "View domains", "content_type": ["admin", "domain"]}}, {"pk": 67, "model": "auth.permission", "fields": {"codename": "add_domainalias", "name": "Can add domain alias", "content_type": ["admin", "domainalias"]}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "change_domainalias", "name": "Can change domain alias", "content_type": ["admin", "domainalias"]}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "delete_domainalias", "name": "Can delete domain alias", "content_type": ["admin", "domainalias"]}}, {"pk": 70, "model": "auth.permission", "fields": {"codename": "view_domaliases", "name": "View domain aliases", "content_type": ["admin", "domainalias"]}}, {"pk": 79, "model": "auth.permission", "fields": {"codename": "add_extension", "name": "Can add extension", "content_type": ["admin", "extension"]}}, {"pk": 80, "model": "auth.permission", "fields": {"codename": "change_extension", "name": "Can change extension", "content_type": ["admin", "extension"]}}, {"pk": 81, "model": "auth.permission", "fields": {"codename": "delete_extension", "name": "Can delete extension", "content_type": ["admin", "extension"]}}, {"pk": 71, "model": "auth.permission", "fields": {"codename": "add_mailbox", "name": "Can add mailbox", "content_type": ["admin", "mailbox"]}}, {"pk": 72, "model": "auth.permission", "fields": {"codename": "change_mailbox", "name": "Can change mailbox", "content_type": ["admin", "mailbox"]}}, {"pk": 73, "model": "auth.permission", "fields": {"codename": "delete_mailbox", "name": "Can delete mailbox", "content_type": ["admin", "mailbox"]}}, {"pk": 74, "model": "auth.permission", "fields": {"codename": "view_mailboxes", "name": "View mailboxes", "content_type": ["admin", "mailbox"]}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "add_objectaccess", "name": "Can add object access", "content_type": ["admin", "objectaccess"]}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "change_objectaccess", "name": "Can change object access", "content_type": ["admin", "objectaccess"]}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "delete_objectaccess", "name": "Can delete object access", "content_type": ["admin", "objectaccess"]}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "add_objectdates", "name": "Can add object dates", "content_type": ["admin", "objectdates"]}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "change_objectdates", "name": "Can change object dates", "content_type": ["admin", "objectdates"]}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "delete_objectdates", "name": "Can delete object dates", "content_type": ["admin", "objectdates"]}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_maddr", "name": "Can add maddr", "content_type": ["amavis_quarantine", "maddr"]}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_maddr", "name": "Can change maddr", "content_type": ["amavis_quarantine", "maddr"]}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_maddr", "name": "Can delete maddr", "content_type": ["amavis_quarantine", "maddr"]}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_mailaddr", "name": "Can add mailaddr", "content_type": ["amavis_quarantine", "mailaddr"]}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_mailaddr", "name": "Can change mailaddr", "content_type": ["amavis_quarantine", "mailaddr"]}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_mailaddr", "name": "Can delete mailaddr", "content_type": ["amavis_quarantine", "mailaddr"]}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_msgrcpt", "name": "Can add msgrcpt", "content_type": ["amavis_quarantine", "msgrcpt"]}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_msgrcpt", "name": "Can change msgrcpt", "content_type": ["amavis_quarantine", "msgrcpt"]}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_msgrcpt", "name": "Can delete msgrcpt", "content_type": ["amavis_quarantine", "msgrcpt"]}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_msgs", "name": "Can add msgs", "content_type": ["amavis_quarantine", "msgs"]}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_msgs", "name": "Can change msgs", "content_type": ["amavis_quarantine", "msgs"]}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_msgs", "name": "Can delete msgs", "content_type": ["amavis_quarantine", "msgs"]}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_policy", "name": "Can add policy", "content_type": ["amavis_quarantine", "policy"]}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_policy", "name": "Can change policy", "content_type": ["amavis_quarantine", "policy"]}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_policy", "name": "Can delete policy", "content_type": ["amavis_quarantine", "policy"]}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_quarantine", "name": "Can add quarantine", "content_type": ["amavis_quarantine", "quarantine"]}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_quarantine", "name": "Can change quarantine", "content_type": ["amavis_quarantine", "quarantine"]}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_quarantine", "name": "Can delete quarantine", "content_type": ["amavis_quarantine", "quarantine"]}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_users", "name": "Can add users", "content_type": ["amavis_quarantine", "users"]}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_users", "name": "Can change users", "content_type": ["amavis_quarantine", "users"]}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_users", "name": "Can delete users", "content_type": ["amavis_quarantine", "users"]}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_wblist", "name": "Can add wblist", "content_type": ["amavis_quarantine", "wblist"]}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_wblist", "name": "Can change wblist", "content_type": ["amavis_quarantine", "wblist"]}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_wblist", "name": "Can delete wblist", "content_type": ["amavis_quarantine", "wblist"]}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": ["auth", "group"]}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": ["auth", "group"]}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": ["auth", "group"]}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": ["auth", "message"]}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": ["auth", "message"]}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": ["auth", "message"]}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": ["auth", "permission"]}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": ["auth", "permission"]}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": ["auth", "permission"]}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "view_permissions", "name": "View permissions", "content_type": ["auth", "permission"]}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": ["auth", "user"]}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": ["auth", "user"]}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": ["auth", "user"]}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": ["contenttypes", "contenttype"]}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": ["contenttypes", "contenttype"]}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": ["contenttypes", "contenttype"]}}, {"pk": 49, "model": "auth.permission", "fields": {"codename": "add_parameter", "name": "Can add parameter", "content_type": ["lib", "parameter"]}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_parameter", "name": "Can change parameter", "content_type": ["lib", "parameter"]}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_parameter", "name": "Can delete parameter", "content_type": ["lib", "parameter"]}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_userparameter", "name": "Can add user parameter", "content_type": ["lib", "userparameter"]}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_userparameter", "name": "Can change user parameter", "content_type": ["lib", "userparameter"]}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_userparameter", "name": "Can delete user parameter", "content_type": ["lib", "userparameter"]}}, {"pk": 85, "model": "auth.permission", "fields": {"codename": "add_limit", "name": "Can add limit", "content_type": ["limits", "limit"]}}, {"pk": 86, "model": "auth.permission", "fields": {"codename": "change_limit", "name": "Can change limit", "content_type": ["limits", "limit"]}}, {"pk": 87, "model": "auth.permission", "fields": {"codename": "delete_limit", "name": "Can delete limit", "content_type": ["limits", "limit"]}}, {"pk": 82, "model": "auth.permission", "fields": {"codename": "add_limitspool", "name": "Can add limits pool", "content_type": ["limits", "limitspool"]}}, {"pk": 83, "model": "auth.permission", "fields": {"codename": "change_limitspool", "name": "Can change limits pool", "content_type": ["limits", "limitspool"]}}, {"pk": 84, "model": "auth.permission", "fields": {"codename": "delete_limitspool", "name": "Can delete limits pool", "content_type": ["limits", "limitspool"]}}, {"pk": 91, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": ["postfix_autoreply", "alias"]}}, {"pk": 92, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": ["postfix_autoreply", "alias"]}}, {"pk": 93, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": ["postfix_autoreply", "alias"]}}, {"pk": 97, "model": "auth.permission", "fields": {"codename": "add_arhistoric", "name": "Can add a rhistoric", "content_type": ["postfix_autoreply", "arhistoric"]}}, {"pk": 98, "model": "auth.permission", "fields": {"codename": "change_arhistoric", "name": "Can change a rhistoric", "content_type": ["postfix_autoreply", "arhistoric"]}}, {"pk": 99, "model": "auth.permission", "fields": {"codename": "delete_arhistoric", "name": "Can delete a rhistoric", "content_type": ["postfix_autoreply", "arhistoric"]}}, {"pk": 94, "model": "auth.permission", "fields": {"codename": "add_armessage", "name": "Can add a rmessage", "content_type": ["postfix_autoreply", "armessage"]}}, {"pk": 95, "model": "auth.permission", "fields": {"codename": "change_armessage", "name": "Can change a rmessage", "content_type": ["postfix_autoreply", "armessage"]}}, {"pk": 96, "model": "auth.permission", "fields": {"codename": "delete_armessage", "name": "Can delete a rmessage", "content_type": ["postfix_autoreply", "armessage"]}}, {"pk": 88, "model": "auth.permission", "fields": {"codename": "add_transport", "name": "Can add transport", "content_type": ["postfix_autoreply", "transport"]}}, {"pk": 89, "model": "auth.permission", "fields": {"codename": "change_transport", "name": "Can change transport", "content_type": ["postfix_autoreply", "transport"]}}, {"pk": 90, "model": "auth.permission", "fields": {"codename": "delete_transport", "name": "Can delete transport", "content_type": ["postfix_autoreply", "transport"]}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": ["sessions", "session"]}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": ["sessions", "session"]}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": ["sessions", "session"]}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": ["sites", "site"]}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": ["sites", "site"]}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": ["sites", "site"]}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": ["south", "migrationhistory"]}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": ["south", "migrationhistory"]}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": ["south", "migrationhistory"]}}, {"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [["add_alias", "admin", "alias"], ["change_alias", "admin", "alias"], ["delete_alias", "admin", "alias"], ["view_aliases", "admin", "alias"], ["add_domainalias", "admin", "domainalias"], ["change_domainalias", "admin", "domainalias"], ["delete_domainalias", "admin", "domainalias"], ["view_domaliases", "admin", "domainalias"], ["add_mailbox", "admin", "mailbox"], ["change_mailbox", "admin", "mailbox"], ["delete_mailbox", "admin", "mailbox"], ["view_mailboxes", "admin", "mailbox"], ["add_user", "auth", "user"], ["change_user", "auth", "user"], ["delete_user", "auth", "user"]]}}, {"pk": 3, "model": "auth.group", "fields": {"name": "Resellers", "permissions": [["add_alias", "admin", "alias"], ["change_alias", "admin", "alias"], ["delete_alias", "admin", "alias"], ["view_aliases", "admin", "alias"], ["add_domain", "admin", "domain"], ["change_domain", "admin", "domain"], ["delete_domain", "admin", "domain"], ["view_domains", "admin", "domain"], ["add_domainalias", "admin", "domainalias"], ["change_domainalias", "admin", "domainalias"], ["delete_domainalias", "admin", "domainalias"], ["view_domaliases", "admin", "domainalias"], ["add_mailbox", "admin", "mailbox"], ["change_mailbox", "admin", "mailbox"], ["delete_mailbox", "admin", "mailbox"], ["view_mailboxes", "admin", "mailbox"], ["view_permissions", "auth", "permission"], ["add_user", "auth", "user"], ["change_user", "auth", "user"], ["delete_user", "auth", "user"]]}}, {"pk": 2, "model": "auth.group", "fields": {"name": "SimpleUsers", "permissions": []}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": false, "last_login": "2012-05-03 16:58:51", "groups": [], "user_permissions": [], "password": "{CRYPT}dTTsGDkA5ZHKg", "email": "", "date_joined": "2012-01-26 15:19:25"}}, {"pk": 2, "model": "auth.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-03 16:58:37", "groups": [1], "user_permissions": [], "password": "{CRYPT}SJ2bQWwabfH/6", "email": "admin@demo.local", "date_joined": "2012-05-03 16:50:15"}}, {"pk": 4, "model": "auth.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-03 16:56:50", "groups": [2], "user_permissions": [], "password": "{CRYPT}2iAFXtxUA6.7Y", "email": "user@demo.local", "date_joined": "2012-05-03 16:56:50"}}, {"pk": 1, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 1, "content_type": ["admin", "user"], "object_id": 1}}, {"pk": 2, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 3, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 2}}, {"pk": 4, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 5, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 6, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 7, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 8, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "user"], "object_id": 2}}, {"pk": 9, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 13, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 4}}, {"pk": 14, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 15, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 16, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "user"], "object_id": 4}}, {"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:49:40", "last_modification": "2012-05-03 16:49:40"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:50:15", "last_modification": "2012-05-03 16:50:36"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:50:15", "last_modification": "2012-05-03 16:50:15"}}, {"pk": 4, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:51:04", "last_modification": "2012-05-03 16:51:04"}}, {"pk": 5, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:56:50", "last_modification": "2012-05-03 16:56:50"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "admin", "path": "admin/"}}, {"pk": 3, "model": "admin.mailbox", "fields": {"dates": 5, "uid": 1001, "quota": 10, "gid": 1001, "user": 4, "domain": 1, "address": "user", "path": "user/"}}, {"pk": 1, "model": "admin.alias", "fields": {"dates": 3, "enabled": true, "domain": 1, "mboxes": [1], "address": "postmaster", "extmboxes": ""}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "limits"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 6, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}]
\ No newline at end of file
+[{"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": false, "last_login": "2012-05-03 16:58:51", "groups": [], "user_permissions": [], "password": "{CRYPT}dTTsGDkA5ZHKg", "email": "", "date_joined": "2012-01-26 15:19:25"}}, {"pk": 2, "model": "auth.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-24 05:00:12", "groups": [1], "user_permissions": [], "password": "{CRYPT}SJ2bQWwabfH/6", "email": "admin@demo.local", "date_joined": "2012-05-03 16:50:15"}}, {"pk": 4, "model": "auth.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-03 16:56:50", "groups": [2], "user_permissions": [], "password": "{CRYPT}2iAFXtxUA6.7Y", "email": "user@demo.local", "date_joined": "2012-05-03 16:56:50"}}, {"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [["add_alias", "admin", "alias"], ["change_alias", "admin", "alias"], ["delete_alias", "admin", "alias"], ["view_aliases", "admin", "alias"], ["add_domainalias", "admin", "domainalias"], ["change_domainalias", "admin", "domainalias"], ["delete_domainalias", "admin", "domainalias"], ["view_domaliases", "admin", "domainalias"], ["add_mailbox", "admin", "mailbox"], ["change_mailbox", "admin", "mailbox"], ["delete_mailbox", "admin", "mailbox"], ["view_mailboxes", "admin", "mailbox"], ["add_user", "auth", "user"], ["change_user", "auth", "user"], ["delete_user", "auth", "user"]]}}, {"pk": 2, "model": "auth.group", "fields": {"name": "SimpleUsers", "permissions": []}}, {"pk": 3, "model": "auth.group", "fields": {"name": "Resellers", "permissions": [["add_alias", "admin", "alias"], ["change_alias", "admin", "alias"], ["delete_alias", "admin", "alias"], ["view_aliases", "admin", "alias"], ["add_domain", "admin", "domain"], ["change_domain", "admin", "domain"], ["delete_domain", "admin", "domain"], ["view_domains", "admin", "domain"], ["add_domainalias", "admin", "domainalias"], ["change_domainalias", "admin", "domainalias"], ["delete_domainalias", "admin", "domainalias"], ["view_domaliases", "admin", "domainalias"], ["add_mailbox", "admin", "mailbox"], ["change_mailbox", "admin", "mailbox"], ["delete_mailbox", "admin", "mailbox"], ["view_mailboxes", "admin", "mailbox"], ["view_permissions", "auth", "permission"], ["add_user", "auth", "user"], ["change_user", "auth", "user"], ["delete_user", "auth", "user"]]}}, {"pk": 1, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 1, "content_type": ["admin", "user"], "object_id": 1}}, {"pk": 2, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 3, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 2}}, {"pk": 4, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 5, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 6, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "domain"], "object_id": 1}}, {"pk": 7, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 1}}, {"pk": 8, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "user"], "object_id": 2}}, {"pk": 9, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "alias"], "object_id": 1}}, {"pk": 13, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 4}}, {"pk": 14, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 15, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "mailbox"], "object_id": 3}}, {"pk": 16, "model": "admin.objectaccess", "fields": {"is_owner": false, "user": 2, "content_type": ["admin", "user"], "object_id": 4}}, {"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:49:40", "last_modification": "2012-05-03 16:49:40"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:50:15", "last_modification": "2012-05-03 16:50:36"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:50:15", "last_modification": "2012-05-03 16:50:15"}}, {"pk": 4, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:51:04", "last_modification": "2012-05-03 16:51:04"}}, {"pk": 5, "model": "admin.objectdates", "fields": {"creation": "2012-05-03 16:56:50", "last_modification": "2012-05-03 16:56:50"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "admin", "path": "admin/"}}, {"pk": 3, "model": "admin.mailbox", "fields": {"dates": 5, "uid": 1001, "quota": 10, "gid": 1001, "user": 4, "domain": 1, "address": "user", "path": "user/"}}, {"pk": 1, "model": "admin.alias", "fields": {"dates": 3, "enabled": true, "domain": 1, "mboxes": [1], "address": "postmaster", "extmboxes": ""}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "limits"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 6, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}]
\ No newline at end of file
diff --git a/lib/fixtures/demo.json b/lib/fixtures/demo.json
index 3651523c3..5d298ab1f 100644
--- a/lib/fixtures/demo.json
+++ b/lib/fixtures/demo.json
@@ -1 +1 @@
-[{"pk": 1, "model": "lib.parameter", "fields": {"name": "admin.STORAGE_PATH", "value": "/srv/vmail"}}, {"pk": 2, "model": "lib.parameter", "fields": {"name": "admin.PASSWORD_SCHEME", "value": "crypt"}}, {"pk": 3, "model": "lib.parameter", "fields": {"name": "admin.ITEMS_PER_PAGE", "value": "30"}}, {"pk": 4, "model": "lib.parameter", "fields": {"name": "general.DEFAULT_TOP_REDIRECTION", "value": "userprefs"}}, {"pk": 5, "model": "lib.parameter", "fields": {"name": "admin.CREATE_DIRECTORIES", "value": "yes"}}, {"pk": 6, "model": "lib.parameter", "fields": {"name": "auth.SECRET_KEY", "value": "abcdefghijklmnop"}}, {"pk": 7, "model": "lib.parameter", "fields": {"name": "admin.MAILBOX_TYPE", "value": "maildir"}}, {"pk": 8, "model": "lib.parameter", "fields": {"name": "admin.AUTHENTICATION_TYPE", "value": "local"}}, {"pk": 9, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_UID", "value": "vmail"}}, {"pk": 10, "model": "lib.parameter", "fields": {"name": "admin.MAILDIR_ROOT", "value": ".maildir"}}, {"pk": 11, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_GID", "value": "vmail"}}, {"pk": 12, "model": "lib.parameter", "fields": {"name": "stats.IMG_ROOTDIR", "value": "/srv/www/modoboa/static/graphics"}}, {"pk": 13, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.USER_CAN_RELEASE", "value": "no"}}, {"pk": 14, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.CHECK_REQUESTS_INTERVAL", "value": "30"}}, {"pk": 15, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_PORT", "value": "9998"}}, {"pk": 16, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SECURED", "value": "no"}}, {"pk": 17, "model": "lib.parameter", "fields": {"name": "postfix_autoreply.AUTOREPLIES_TIMEOUT", "value": "86400"}}, {"pk": 18, "model": "lib.parameter", "fields": {"name": "sievefilters.AUTHENTICATION_MECH", "value": "PLAIN"}}, {"pk": 19, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_SOCKET", "value": "/var/amavis/amavisd.sock"}}, {"pk": 20, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_MODE", "value": "inet"}}, {"pk": 21, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.SELF_SERVICE", "value": "no"}}, {"pk": 22, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_PORT", "value": "143"}}, {"pk": 23, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SECURED_MODE", "value": "none"}}, {"pk": 24, "model": "lib.parameter", "fields": {"name": "sievefilters.SERVER", "value": "127.0.0.1"}}, {"pk": 25, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SERVER", "value": "127.0.0.1"}}, {"pk": 26, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_AUTHENTICATION", "value": "no"}}, {"pk": 27, "model": "lib.parameter", "fields": {"name": "webmail.MAX_ATTACHMENT_SIZE", "value": "512K"}}, {"pk": 28, "model": "lib.parameter", "fields": {"name": "stats.RRD_ROOTDIR", "value": "/srv/www/modoboa/tmp"}}, {"pk": 29, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.RELEASED_MSGS_CLEANUP", "value": "no"}}, {"pk": 30, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.MAX_MESSAGES_AGE", "value": "14"}}, {"pk": 31, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_PORT", "value": "25"}}, {"pk": 33, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SERVER", "value": "127.0.0.1"}}, {"pk": 34, "model": "lib.parameter", "fields": {"name": "sievefilters.STARTTLS", "value": "yes"}}, {"pk": 35, "model": "lib.parameter", "fields": {"name": "sievefilters.PORT", "value": "2000"}}, {"pk": 36, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_HOST", "value": "localhost"}}, {"pk": 37, "model": "lib.parameter", "fields": {"name": "stats.LOGFILE", "value": "/var/log/mail.log"}}]
\ No newline at end of file
+[{"pk": 1, "model": "lib.parameter", "fields": {"name": "admin.STORAGE_PATH", "value": "/srv/vmail"}}, {"pk": 2, "model": "lib.parameter", "fields": {"name": "admin.PASSWORD_SCHEME", "value": "crypt"}}, {"pk": 3, "model": "lib.parameter", "fields": {"name": "admin.ITEMS_PER_PAGE", "value": "30"}}, {"pk": 4, "model": "lib.parameter", "fields": {"name": "general.DEFAULT_TOP_REDIRECTION", "value": "userprefs"}}, {"pk": 5, "model": "lib.parameter", "fields": {"name": "admin.CREATE_DIRECTORIES", "value": "yes"}}, {"pk": 6, "model": "lib.parameter", "fields": {"name": "auth.SECRET_KEY", "value": "abcdefghijklmnop"}}, {"pk": 7, "model": "lib.parameter", "fields": {"name": "admin.MAILBOX_TYPE", "value": "maildir"}}, {"pk": 8, "model": "lib.parameter", "fields": {"name": "admin.AUTHENTICATION_TYPE", "value": "local"}}, {"pk": 9, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_UID", "value": "vmail"}}, {"pk": 10, "model": "lib.parameter", "fields": {"name": "admin.MAILDIR_ROOT", "value": ".maildir"}}, {"pk": 11, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_GID", "value": "vmail"}}, {"pk": 12, "model": "lib.parameter", "fields": {"name": "stats.IMG_ROOTDIR", "value": "/srv/www/modoboa/media/stats"}}, {"pk": 13, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.USER_CAN_RELEASE", "value": "no"}}, {"pk": 14, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.CHECK_REQUESTS_INTERVAL", "value": "30"}}, {"pk": 15, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_PORT", "value": "9998"}}, {"pk": 16, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SECURED", "value": "no"}}, {"pk": 17, "model": "lib.parameter", "fields": {"name": "postfix_autoreply.AUTOREPLIES_TIMEOUT", "value": "86400"}}, {"pk": 18, "model": "lib.parameter", "fields": {"name": "sievefilters.AUTHENTICATION_MECH", "value": "PLAIN"}}, {"pk": 19, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_SOCKET", "value": "/var/amavis/amavisd.sock"}}, {"pk": 20, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_MODE", "value": "inet"}}, {"pk": 21, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.SELF_SERVICE", "value": "no"}}, {"pk": 22, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_PORT", "value": "143"}}, {"pk": 23, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SECURED_MODE", "value": "none"}}, {"pk": 24, "model": "lib.parameter", "fields": {"name": "sievefilters.SERVER", "value": "127.0.0.1"}}, {"pk": 25, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SERVER", "value": "127.0.0.1"}}, {"pk": 26, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_AUTHENTICATION", "value": "no"}}, {"pk": 27, "model": "lib.parameter", "fields": {"name": "webmail.MAX_ATTACHMENT_SIZE", "value": "512K"}}, {"pk": 28, "model": "lib.parameter", "fields": {"name": "stats.RRD_ROOTDIR", "value": "/srv/www/modoboa/tmp"}}, {"pk": 29, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.RELEASED_MSGS_CLEANUP", "value": "no"}}, {"pk": 30, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.MAX_MESSAGES_AGE", "value": "14"}}, {"pk": 31, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_PORT", "value": "25"}}, {"pk": 33, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SERVER", "value": "127.0.0.1"}}, {"pk": 34, "model": "lib.parameter", "fields": {"name": "sievefilters.STARTTLS", "value": "yes"}}, {"pk": 35, "model": "lib.parameter", "fields": {"name": "sievefilters.PORT", "value": "2000"}}, {"pk": 36, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_HOST", "value": "localhost"}}, {"pk": 37, "model": "lib.parameter", "fields": {"name": "stats.LOGFILE", "value": "/var/log/mail.log"}}]