From 76c124e679f39d2a187aaff6511436f3ed9210e6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 7 Oct 2013 21:18:21 +0200
Subject: [PATCH] Fixing migration scripts and the deploy command.

It seems I misunderstood the way to migrate to a custom user model
for 1.0.0.
---
 modoboa/core/commands/deploy.py               | 10 +++-
 .../core/commands/templates/settings.py.tpl   | 24 ++++-----
 modoboa/core/management.py                    | 20 ++++----
 .../admin/migrations/0001_initial.py          | 50 ++-----------------
 .../0002_auto__del_field_alias_mbox.py        |  5 +-
 .../migrations/0003_auto__add_extension.py    |  5 +-
 .../admin/migrations/0004_add_permissions.py  | 21 ++++----
 .../0005_increase_columns_length.py           |  9 ++--
 .../migrations/0006_auto__add_domainalias.py  |  5 +-
 ...ess__chg_field_alias_address__del_field.py |  5 +-
 .../migrations/0008_update_mailbox_path.py    |  5 +-
 .../0009_auto__add_field_alias_extmboxes.py   |  5 +-
 .../migrations/0010_fill_alias_domain.py      |  5 +-
 ...d_domain_dates__add_field_domainalias_d.py |  5 +-
 .../migrations/0012_fill_object_dates.py      |  5 +-
 .../migrations/0013_update_mailbox_path.py    |  5 +-
 .../0014_auto__add_unique_domain_name.py      |  5 +-
 .../admin/migrations/0015_move_passwords.py   |  5 +-
 ...que_objectaccess_user_content_type_obje.py |  9 ++--
 .../admin/migrations/0017_set_permissions.py  | 23 ++++-----
 ...8_auto__add_unique_alias_domain_address.py |  9 ++--
 .../migrations/0019_set_default_group.py      | 11 ++--
 .../migrations/0020_rename_amavis_ext.py      |  7 ++-
 .../0021_default_superadmin_ownership.py      | 13 +++--
 ...l_field_mailbox_gid__del_field_mailbox_.py |  7 ++-
 .../admin/migrations/0023_auto__add_quota.py  |  7 ++-
 .../admin/migrations/0024_create_quotas.py    |  7 ++-
 .../0025_auto__add_field_quota_mbox.py        |  7 ++-
 .../admin/migrations/0026_set_quota_mbox.py   |  7 ++-
 ...uto__add_field_mailbox_use_domain_quota.py |  7 ++-
 .../0028_auto__chg_field_mailbox_quota.py     |  7 ++-
 ...ilbox_user__chg_field_objectaccess_user.py |  9 ++--
 .../0034_auto__add_field_user_is_local.py     |  6 +--
 modoboa/extensions/limits/__init__.py         |  5 --
 .../limits/migrations/0001_initial.py         |  7 ++-
 modoboa/lib/compat.py                         |  2 +-
 modoboa/lib/logutils.py                       | 11 ----
 modoboa/lib/migrations/0001_initial.py        |  7 ++-
 .../lib/migrations/0002_move_secret_key.py    |  5 +-
 .../lib/migrations/0003_clean_parameters.py   |  5 +-
 ...__add_log__chg_field_userparameter_user.py |  7 +--
 41 files changed, 144 insertions(+), 235 deletions(-)
 delete mode 100644 modoboa/lib/logutils.py

diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py
index 297ee0509..bac58eab4 100644
--- a/modoboa/core/commands/deploy.py
+++ b/modoboa/core/commands/deploy.py
@@ -6,6 +6,7 @@ import getpass
 import subprocess
 from django.core import management
 from django.template import Context, Template
+from modoboa.lib.sysutils import exec_cmd
 from modoboa.core.management import Command
 
 dbconn_tpl = """
@@ -135,7 +136,14 @@ class DeployCommand(Command):
 
         if parsed_args.syncdb:
             self._exec_django_command(
-                "syncdb", parsed_args.name, '--migrate', '--noinput'
+                "syncdb", parsed_args.name, '--noinput'
+            )
+            exec_cmd('sed -ri "s|^#(\s+\'south)|\\1|" %s/settings.py' % path)
+            self._exec_django_command(
+                "syncdb", parsed_args.name,
+            )
+            self._exec_django_command(
+                'migrate', parsed_args.name, '--fake'
             )
             self._exec_django_command(
                 "loaddata", parsed_args.name, 'initial_users.json'
diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 4f926f712..c46ddd6f7 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -141,10 +141,8 @@ INSTALLED_APPS = (
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
-    'south',
-
-    # Extra tools
-    # 'modoboa.tools.pfxadmin_migrate',
+#    'south',
+    'reversion',
 )
 
 # A dedicated place to register Modoboa applications
@@ -152,26 +150,22 @@ INSTALLED_APPS = (
 # Do not change the order.
 MODOBOA_APPS = (
     'modoboa',
-    'modoboa.auth',
-    'modoboa.admin',
+    'modoboa.core',
     'modoboa.lib',
-    'modoboa.userprefs',
-
+    # Modoboa extensions here.
+    'modoboa.extensions.admin',
     'modoboa.extensions.limits',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
     'modoboa.extensions.stats',
-    {% if not amavis_conn %}#{% endif %}'modoboa.extensions.amavis',
     'modoboa.extensions.sievefilters',
+    'modoboa.extensions.stats',
+    {% if not amavis_conn %}#{% endif %}'modoboa.extensions.amavis',
 )
 
 INSTALLED_APPS += MODOBOA_APPS
 
-INSTALLED_APPS += (
-    'reversion',
-)
-
-AUTH_USER_MODEL = 'admin.User'
+AUTH_USER_MODEL = 'core.User'
 
 #MODOBOA_CUSTOM_LOGO = os.path.join(MEDIA_URL, "custom_logo.png")
 
@@ -209,7 +203,7 @@ LOGGING = {
             'formatter': 'syslog'
         },
         'modoboa': {
-            'class': 'modoboa.lib.logutils.SQLHandler',
+            'class': 'modoboa.core.loggers.SQLHandler',
         }
     },
     'loggers': {
diff --git a/modoboa/core/management.py b/modoboa/core/management.py
index 82db79f11..10c9e60ef 100644
--- a/modoboa/core/management.py
+++ b/modoboa/core/management.py
@@ -1,10 +1,10 @@
 # coding: utf-8
-
-from django.conf import settings
-from django.template import Context, Template
-import argparse
 import os
 import sys
+import argparse
+from django.conf import settings
+from django.template import Context, Template
+
 
 class Command(object):
     """Base command class
@@ -19,7 +19,7 @@ class Command(object):
         self._verbose = verbose
         if not settings.configured:
             settings.configure()
-        self._templates_dir = "%s/templates" % os.path.dirname(__file__)
+        self._templates_dir = "%s/commands/templates" % os.path.dirname(__file__)
 
     def _render_template(self, tplfile, env):
         fp = open(tplfile)
@@ -36,7 +36,8 @@ class Command(object):
 
         :param parsed_args:
         """
-        raise NotImplemented
+        raise NotImplementedError
+
 
 def scan_for_commands(dirname="commands"):
     """Build a dictionnary containing all commands
@@ -58,7 +59,7 @@ def scan_for_commands(dirname="commands"):
                             [cmdname])
         cmdmod = getattr(cmdmod, cmdname)
         if '_' in cmdname:
-            cmdclassname = ''.join(map(lambda s: s.capitalize(), cmdname.split('_')))
+            cmdclassname = ''.join([s.capitalize() for s in cmdname.split('_')])
         else:
             cmdclassname = cmdname.capitalize()
         try:
@@ -68,13 +69,14 @@ def scan_for_commands(dirname="commands"):
         result[cmdname] = cmdclass
     return result
 
+
 def handle_command_line():
     commands = scan_for_commands()
     parser = argparse.ArgumentParser(
         description="A set of utilities to ease the installation of Modoboa.",
         epilog="""Available commands:
 %s
-""" % "\n".join(map(lambda c: "\t" + c, sorted(commands))))
+""" % "\n".join(["\t%s" % c for c in sorted(commands)]))
     parser.add_argument('--verbose', action='store_true',
                         help='Activate verbose output')
     parser.add_argument('command', type=str,
@@ -82,7 +84,7 @@ def handle_command_line():
     (args, remaining) = parser.parse_known_args()
 
     if not args.command in commands:
-        print >>sys.stderr, "Unknown command '%s'" % args.command
+        print >> sys.stderr, "Unknown command '%s'" % args.command
         sys.exit(1)
 
     commands[args.command](commands, verbose=args.verbose).run(remaining)
diff --git a/modoboa/extensions/admin/migrations/0001_initial.py b/modoboa/extensions/admin/migrations/0001_initial.py
index aea35074c..e36bb068f 100644
--- a/modoboa/extensions/admin/migrations/0001_initial.py
+++ b/modoboa/extensions/admin/migrations/0001_initial.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -26,7 +25,7 @@ class Migration(SchemaMigration):
             ('quota', self.gf('django.db.models.fields.IntegerField')()),
             ('full_address', self.gf('django.db.models.fields.CharField')(max_length=150)),
             ('gid', self.gf('django.db.models.fields.IntegerField')()),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
             ('address', self.gf('django.db.models.fields.CharField')(max_length=100)),
             ('path', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('password', self.gf('django.db.models.fields.CharField')(max_length=100)),
@@ -44,41 +43,6 @@ class Migration(SchemaMigration):
             ('address', self.gf('django.db.models.fields.CharField')(max_length=100)),
         ))
         db.send_create_signal('admin', ['Alias'])
-
-        if user_model_name != 'admin.User':
-            return
-        # Adding model 'User'
-        db.create_table(u'admin_user', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('password', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
-            ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=254)),
-            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
-            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=254, blank=True)),
-            ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)),
-            ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
-        ))
-        db.send_create_signal(u'admin', ['User'])
-        
-        # Adding M2M table for field groups on 'User'
-        db.create_table(u'admin_user_groups', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('user', models.ForeignKey(orm[u'admin.user'], null=False)),
-            ('group', models.ForeignKey(orm[u'auth.group'], null=False))
-        ))
-        db.create_unique(u'admin_user_groups', ['user_id', 'group_id'])
-
-        # Adding M2M table for field user_permissions on 'User'
-        db.create_table(u'admin_user_user_permissions', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('user', models.ForeignKey(orm[u'admin.user'], null=False)),
-            ('permission', models.ForeignKey(orm[u'auth.permission'], null=False))
-        ))
-        db.create_unique(u'admin_user_user_permissions', ['user_id', 'permission_id'])
-    
     
     def backwards(self, orm):
         
@@ -90,12 +54,6 @@ class Migration(SchemaMigration):
 
         # Deleting model 'Alias'
         db.delete_table('admin_alias')
-
-        if user_model_name != 'admin.User':
-            return
-        db.delete_table('admin_user')
-        db.delete_table('admin_user_groups')
-        db.delete_table('admin_user_user_permissions')
     
     
     models = {
@@ -126,7 +84,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -141,8 +99,8 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
-            'Meta': {'object_name': 'User', 'db_table': "'admin_user'"},
+        'auth.user': {
+            'Meta': {'object_name': 'User', 'db_table': "'auth_user'"},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py b/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py
index ae9f4d7c7..c9e11d33e 100644
--- a/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py
+++ b/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -63,7 +62,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -78,7 +77,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0003_auto__add_extension.py b/modoboa/extensions/admin/migrations/0003_auto__add_extension.py
index d33e44526..2d3b82afc 100644
--- a/modoboa/extensions/admin/migrations/0003_auto__add_extension.py
+++ b/modoboa/extensions/admin/migrations/0003_auto__add_extension.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -59,7 +58,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -74,7 +73,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0004_add_permissions.py b/modoboa/extensions/admin/migrations/0004_add_permissions.py
index 962d1eed6..57fbea7d6 100644
--- a/modoboa/extensions/admin/migrations/0004_add_permissions.py
+++ b/modoboa/extensions/admin/migrations/0004_add_permissions.py
@@ -3,22 +3,23 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from django.contrib.auth.models import Permission
-from django.contrib.contenttypes.models import ContentType
-from modoboa.lib.compat import user_model_name
+#from django.contrib.auth.models import Permission
+#from django.contrib.contenttypes.models import ContentType
 
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
-        perm_ct = ContentType.objects.get(app_label="auth", model="permission")
-        #perm_ct = orm["contenttypes.ContentType"].objects.get(app_label="auth", model="permission")
-        view_perms = Permission(name="View permissions", codename="view_permissions",
-                                content_type=perm_ct)
+        #perm_ct = ContentType.objects.get(app_label="auth", model="permission")
+        perm_ct = orm["contenttypes.ContentType"].objects.get(app_label="auth", model="permission")
+        view_perms = orm['auth.Permission'](
+            name="View permissions", codename="view_permissions",
+            content_type=perm_ct
+        )
         view_perms.save()
 
     def backwards(self, orm):
-        p = orm.Permission.objects.get(codename="view_permissions")
+        p = orm['auth.Permission'].objects.get(codename="view_permissions")
         p.delete()
 
 
@@ -56,7 +57,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -71,7 +72,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0005_increase_columns_length.py b/modoboa/extensions/admin/migrations/0005_increase_columns_length.py
index 8dd764764..be4adc771 100644
--- a/modoboa/extensions/admin/migrations/0005_increase_columns_length.py
+++ b/modoboa/extensions/admin/migrations/0005_increase_columns_length.py
@@ -3,14 +3,13 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name, user_table_name
 
 
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        db.alter_column(user_table_name, "username", models.CharField(unique=True, max_length=254))
-        db.alter_column(user_table_name, "email", models.CharField(max_length=254))
+        db.alter_column('auth_user', "username", models.CharField(unique=True, max_length=254))
+        db.alter_column('auth_user', "email", models.CharField(max_length=254))
 
     def backwards(self, orm):
         raise RuntimeError("Cannot revert this migration")
@@ -49,7 +48,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -64,7 +63,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py b/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py
index 283b9c4dd..d8652c116 100644
--- a/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py
+++ b/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -71,7 +70,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -86,7 +85,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py b/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py
index 08870cbfc..5f1ff1c57 100644
--- a/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py
+++ b/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -71,7 +70,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -86,7 +85,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py
index e69e3c455..d38f0f85c 100644
--- a/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py
+++ b/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -56,7 +55,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -71,7 +70,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py b/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py
index c9dec14c6..0d3a8a02e 100644
--- a/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py
+++ b/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -62,7 +61,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -77,7 +76,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py b/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py
index a1c800c2f..fc5ceeb34 100644
--- a/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py
+++ b/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -59,7 +58,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -74,7 +73,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py b/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py
index 0362c44aa..52f8812c3 100644
--- a/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py
+++ b/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -94,7 +93,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -115,7 +114,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0012_fill_object_dates.py b/modoboa/extensions/admin/migrations/0012_fill_object_dates.py
index face3337e..23fc740b8 100644
--- a/modoboa/extensions/admin/migrations/0012_fill_object_dates.py
+++ b/modoboa/extensions/admin/migrations/0012_fill_object_dates.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 def create_od(orm, obj):
@@ -74,7 +73,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -95,7 +94,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py
index f0e85b688..1f4dc201e 100644
--- a/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py
+++ b/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -63,7 +62,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -84,7 +83,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py b/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py
index 7ba0b9249..829fc4a7b 100644
--- a/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py
+++ b/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -65,7 +64,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -86,7 +85,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0015_move_passwords.py b/modoboa/extensions/admin/migrations/0015_move_passwords.py
index 3686fbaf7..ebf626a2e 100644
--- a/modoboa/extensions/admin/migrations/0015_move_passwords.py
+++ b/modoboa/extensions/admin/migrations/0015_move_passwords.py
@@ -4,7 +4,6 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 from modoboa.lib.models import Parameter
-from modoboa.lib.compat import user_model_name
 from modoboa.lib.dbutils import db_table_exists
 
 
@@ -72,7 +71,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -93,7 +92,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py b/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py
index 2ad47dea5..81b6701c3 100644
--- a/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py
+++ b/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -13,7 +12,7 @@ class Migration(SchemaMigration):
         # Adding model 'ObjectAccess'
         db.create_table('admin_objectaccess', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
             ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
             ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
             ('is_owner', self.gf('django.db.models.fields.BooleanField')(default=False)),
@@ -75,7 +74,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -83,7 +82,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']" })
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -104,7 +103,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0017_set_permissions.py b/modoboa/extensions/admin/migrations/0017_set_permissions.py
index 0d011f6f6..9242f6838 100644
--- a/modoboa/extensions/admin/migrations/0017_set_permissions.py
+++ b/modoboa/extensions/admin/migrations/0017_set_permissions.py
@@ -4,7 +4,6 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from modoboa.lib.compat import user_model_name, user_table_name
 
 
 class Migration(DataMigration):
@@ -17,7 +16,7 @@ class Migration(DataMigration):
         objaccess.save()
 
     def forwards(self, orm):
-        superusers = orm[user_model_name].objects.filter(is_superuser=True)
+        superusers = orm['auth.User'].objects.filter(is_superuser=True)
         if not len(superusers):
             # Empty db, nothing to do
             return
@@ -26,14 +25,14 @@ class Migration(DataMigration):
         # object. (user, domain, domain alias, mailbox, alias)
         try:
             uct = orm['contenttypes.ContentType'].objects.get(
-                app_label='admin', model='user'
-                )
+                app_label='auth', model='user'
+            )
         except ObjectDoesNotExist:
             uct = orm['contenttypes.ContentType'](
-                name='user', app_label='admin', model='user'
-                )
+                name='user', app_label='auth', model='user'
+            )
             uct.save()
-        for account in orm[user_model_name].objects.all():
+        for account in orm['auth.User'].objects.all():
             for i, su in enumerate(superusers):
                 self.grant_access(orm, su, uct, account, i == 0)
         domct = orm['contenttypes.ContentType'].objects.get(
@@ -62,7 +61,7 @@ class Migration(DataMigration):
                 self.grant_access(orm, su, alct, alias, i == 0)
 
         # 2: domain admins must have access to their domain's content
-        for da in orm[user_model_name].objects.filter(groups__name='DomainAdmins'):
+        for da in orm['auth.User'].objects.filter(groups__name='DomainAdmins'):
             dom = da.mailbox_set.all()[0].domain
             self.grant_access(orm, da, domct, dom)
 
@@ -119,7 +118,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -127,7 +126,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -148,8 +147,8 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
-            'Meta': {'object_name': 'User', 'db_table': "'admin_user'"},
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py b/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py
index bdf403947..b4f7c03cb 100644
--- a/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py
+++ b/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -63,7 +62,7 @@ class Migration(SchemaMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -71,7 +70,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -92,8 +91,8 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
-            'Meta': {'object_name': 'User', 'db_table': "'admin_user'"},
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0019_set_default_group.py b/modoboa/extensions/admin/migrations/0019_set_default_group.py
index 479266596..7af4cd3fa 100644
--- a/modoboa/extensions/admin/migrations/0019_set_default_group.py
+++ b/modoboa/extensions/admin/migrations/0019_set_default_group.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name, user_table_name
 
 
 class Migration(DataMigration):
@@ -15,7 +14,7 @@ class Migration(DataMigration):
         except orm["auth.Group"].DoesNotExist:
             sugroup = orm["auth.Group"](name="SimpleUsers")
             sugroup.save()
-        for account in orm[user_model_name].objects.all():
+        for account in orm['auth.User'].objects.all():
             if not len(account.groups.all()):
                 account.groups.add(sugroup)
                 account.save()
@@ -68,7 +67,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -76,7 +75,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -97,8 +96,8 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
-            'Meta': {'object_name': 'User', 'db_table': "'admin_user'"},
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py b/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py
index 60fe83450..c0d69f544 100644
--- a/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py
+++ b/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py
@@ -4,7 +4,6 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -70,7 +69,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -78,7 +77,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -99,7 +98,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py b/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py
index 29fc45611..58f7aeedf 100644
--- a/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py
+++ b/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py
@@ -4,7 +4,6 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from modoboa.lib.compat import user_model_name, user_table_name
 
 
 class Migration(DataMigration):
@@ -12,11 +11,11 @@ class Migration(DataMigration):
     def forwards(self, orm):
         "Write your forwards methods here."
         try:
-            su = orm[user_model_name].objects.get(pk=1)
+            su = orm['auth.User'].objects.get(pk=1)
         except ObjectDoesNotExist:
             return
         uct = orm['contenttypes.ContentType'].objects.get(
-            app_label='admin', model='user'
+            app_label='auth', model='user'
         )
         su.objectaccess_set.filter(content_type=uct, object_id=1).update(is_owner=True)
 
@@ -67,7 +66,7 @@ class Migration(DataMigration):
             'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'uid': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -75,7 +74,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -96,8 +95,8 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
-            'Meta': {'object_name': 'User', 'db_table': "'admin_user'"},
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py b/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py
index c80960775..e83be9f87 100644
--- a/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py
+++ b/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -70,7 +69,7 @@ class Migration(SchemaMigration):
             'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -78,7 +77,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -99,7 +98,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0023_auto__add_quota.py b/modoboa/extensions/admin/migrations/0023_auto__add_quota.py
index b6f95b699..f386d38a9 100644
--- a/modoboa/extensions/admin/migrations/0023_auto__add_quota.py
+++ b/modoboa/extensions/admin/migrations/0023_auto__add_quota.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -63,7 +62,7 @@ class Migration(SchemaMigration):
             'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -71,7 +70,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -98,7 +97,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0024_create_quotas.py b/modoboa/extensions/admin/migrations/0024_create_quotas.py
index 06480b9f4..308350b1d 100644
--- a/modoboa/extensions/admin/migrations/0024_create_quotas.py
+++ b/modoboa/extensions/admin/migrations/0024_create_quotas.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -57,7 +56,7 @@ class Migration(DataMigration):
             'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -65,7 +64,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -92,7 +91,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py b/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py
index a97c68b81..2cc877617 100644
--- a/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py
+++ b/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -60,7 +59,7 @@ class Migration(SchemaMigration):
             'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -68,7 +67,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -96,7 +95,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py b/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py
index 351c35223..f25fcd261 100644
--- a/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py
+++ b/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -58,7 +57,7 @@ class Migration(DataMigration):
             'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -66,7 +65,7 @@ class Migration(DataMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -94,7 +93,7 @@ class Migration(DataMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py b/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py
index 03ffaabe7..9fc0d74af 100644
--- a/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py
+++ b/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -61,7 +60,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.IntegerField', [], {}),
             'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -69,7 +68,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -97,7 +96,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py b/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py
index 90e924029..0461260cf 100644
--- a/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py
+++ b/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -59,7 +58,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'quota': ('django.db.models.fields.PositiveIntegerField', [], {}),
             'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectaccess': {
             'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
@@ -67,7 +66,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
         },
         u'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
@@ -95,7 +94,7 @@ class Migration(SchemaMigration):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py b/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py
index 3adc88fee..d1934ef32 100644
--- a/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py
+++ b/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py
@@ -3,23 +3,20 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.dbutils import db_table_exists
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        if db_table_exists('admin_user'):
-            return
         db.rename_table('auth_user', 'admin_user')
         db.rename_table('auth_user_groups', 'admin_user_groups')
         db.rename_table('auth_user_user_permissions', 'admin_user_user_permissions')
+        db.send_create_signal('admin', ['User'])
 
         # Changing field 'Mailbox.user'
-        db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name]))
+        db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User']))
         # Changing field 'ObjectAccess.user'
-        db.alter_column(u'admin_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name]))
+        db.alter_column(u'admin_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User']))
 
     def backwards(self, orm):
         raise RuntimeError("Cannot revert this migration")
diff --git a/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py b/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py
index eddb9bd5e..5b4a89e50 100644
--- a/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py
+++ b/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py
@@ -9,14 +9,14 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         # Adding field 'User.is_local'
-        db.add_column(u'admin_user', 'is_local',
+        db.add_column('admin_user', 'is_local',
                       self.gf('django.db.models.fields.BooleanField')(default=True),
                       keep_default=False)
 
 
     def backwards(self, orm):
         # Deleting field 'User.is_local'
-        db.delete_column(u'admin_user', 'is_local')
+        db.delete_column('admin_user', 'is_local')
 
 
     models = {
@@ -123,4 +123,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['admin']
\ No newline at end of file
+    complete_apps = ['admin']
diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py
index 657e9a43e..0bbf995fb 100644
--- a/modoboa/extensions/limits/__init__.py
+++ b/modoboa/extensions/limits/__init__.py
@@ -35,11 +35,6 @@ class Limits(ModoExtension):
         grp.save()
         grp.permissions.add(*dagrp.permissions.all())
 
-        ct = ContentType.objects.get_for_model(Permission)
-        for pname in ["view_permissions"]:
-            perm = Permission.objects.get(content_type=ct, codename=pname)
-            grp.permissions.add(perm)
-
         ct = ContentType.objects.get_for_model(Domain)
         for pname in ["view_domains", "add_domain", "change_domain", "delete_domain"]:
             perm = Permission.objects.get(content_type=ct, codename=pname)
diff --git a/modoboa/extensions/limits/migrations/0001_initial.py b/modoboa/extensions/limits/migrations/0001_initial.py
index 3c4f34fe9..4a5762307 100644
--- a/modoboa/extensions/limits/migrations/0001_initial.py
+++ b/modoboa/extensions/limits/migrations/0001_initial.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -13,7 +12,7 @@ class Migration(SchemaMigration):
         # Adding model 'LimitsPool'
         db.create_table('limits_limitspool', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[user_model_name], unique=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
         ))
         db.send_create_signal('limits', ['LimitsPool'])
 
@@ -57,7 +56,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
@@ -91,7 +90,7 @@ class Migration(SchemaMigration):
         'limits.limitspool': {
             'Meta': {'object_name': 'LimitsPool'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['%s']" % user_model_name, 'unique': 'True'})
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
         }
     }
 
diff --git a/modoboa/lib/compat.py b/modoboa/lib/compat.py
index ed54ea216..00bc93f27 100644
--- a/modoboa/lib/compat.py
+++ b/modoboa/lib/compat.py
@@ -1,4 +1,4 @@
 from django.conf import settings
 
 user_model_name = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
-user_table_name = "auth_user" if user_model_name == "auth.User" else "admin_user"
+user_table_name = "auth_user" if user_model_name == "auth.User" else "core_user"
diff --git a/modoboa/lib/logutils.py b/modoboa/lib/logutils.py
deleted file mode 100644
index 210fd63eb..000000000
--- a/modoboa/lib/logutils.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import logging
-from models import Log
-
-
-class SQLHandler(logging.Handler):
-
-    def emit(self, record):
-        Log.objects.create(
-            message=record.getMessage(), level=record.levelname,
-            logger=record.name
-        )
diff --git a/modoboa/lib/migrations/0001_initial.py b/modoboa/lib/migrations/0001_initial.py
index 95bb6d493..3f7087488 100644
--- a/modoboa/lib/migrations/0001_initial.py
+++ b/modoboa/lib/migrations/0001_initial.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -23,7 +22,7 @@ class Migration(SchemaMigration):
             ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
         ))
         db.send_create_signal('lib', ['UserParameter'])
     
@@ -51,7 +50,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
@@ -84,7 +83,7 @@ class Migration(SchemaMigration):
             'Meta': {'object_name': 'UserParameter'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
             'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         }
     }
diff --git a/modoboa/lib/migrations/0002_move_secret_key.py b/modoboa/lib/migrations/0002_move_secret_key.py
index b3e9e5d30..3f4feb3f0 100644
--- a/modoboa/lib/migrations/0002_move_secret_key.py
+++ b/modoboa/lib/migrations/0002_move_secret_key.py
@@ -3,7 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -38,7 +37,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
@@ -71,7 +70,7 @@ class Migration(DataMigration):
             'Meta': {'object_name': 'UserParameter'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
             'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         }
     }
diff --git a/modoboa/lib/migrations/0003_clean_parameters.py b/modoboa/lib/migrations/0003_clean_parameters.py
index 277791d0e..2aa0edea5 100644
--- a/modoboa/lib/migrations/0003_clean_parameters.py
+++ b/modoboa/lib/migrations/0003_clean_parameters.py
@@ -4,7 +4,6 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(DataMigration):
@@ -50,7 +49,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        user_model_name: {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
@@ -83,7 +82,7 @@ class Migration(DataMigration):
             'Meta': {'object_name': 'UserParameter'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
             'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         }
     }
diff --git a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py
index 89c681f5b..052538afd 100644
--- a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py
+++ b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py
@@ -3,8 +3,6 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from modoboa.lib.dbutils import db_table_exists
-from modoboa.lib.compat import user_model_name
 
 
 class Migration(SchemaMigration):
@@ -20,11 +18,8 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal(u'lib', ['Log'])
 
-
-        if db_table_exists('admin_user'):
-            return
         # Changing field 'UserParameter.user'
-        db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name]))
+        db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User']))
 
     def backwards(self, orm):
         raise RuntimeError("Cannot revert this migration")