diff --git a/admin/models.py b/admin/models.py
index aed4cd235..8a1fb1802 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -2,7 +2,6 @@
 from django.db import models, IntegrityError
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
-from django.dispatch import receiver
 from django.conf import settings
 from modoboa.lib import parameters
 from modoboa.lib.sysutils import exec_cmd, exec_as_vuser
@@ -432,7 +431,6 @@ class Extension(models.Model):
 try:
     from django_auth_ldap.backend import populate_user
 
-    @receiver(populate_user, dispatch_uid="myuid")
     def populate_callback(sender, user=None, **kwargs):
         if user is None:
             return
@@ -451,5 +449,7 @@ try:
             mb = Mailbox()
             mb.save_from_user(localpart, domain, user)
 
+    populate_user.connect(populate_callback, dispatch_uid="myuid")
+
 except ImportError, inst:
     pass
diff --git a/admin/templatetags/admin_extras.py b/admin/templatetags/admin_extras.py
index c2a39923a..e795d99f2 100644
--- a/admin/templatetags/admin_extras.py
+++ b/admin/templatetags/admin_extras.py
@@ -188,7 +188,7 @@ def mailbox_actions(user, mboxid):
 
 @register.simple_tag
 def mbalias_actions(user, aliasid):
-    from admin.models import Alias
+    from modoboa.admin.models import Alias
 
     alias = Alias.objects.get(pk=aliasid)
     if alias.ui_disabled(user):
diff --git a/admin/views.py b/admin/views.py
index b3647dfc1..c9b921347 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -15,8 +15,8 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from lib import *
 from modoboa import admin, userprefs
 from models import *
-from admin.permissions import *
-from admin.tables import *
+from modoboa.admin.permissions import *
+from modoboa.admin.tables import *
 from modoboa.lib import events, parameters
 from modoboa.auth.lib import crypt_password
 from modoboa.lib.webutils \