diff --git a/modoboa/extensions/admin/factories.py b/modoboa/extensions/admin/factories.py
index 9097f1b2c..b4399e0cd 100644
--- a/modoboa/extensions/admin/factories.py
+++ b/modoboa/extensions/admin/factories.py
@@ -37,7 +37,8 @@ def populate_database():
     """
     dom = DomainFactory.create(name="test.com")
     admin = UserFactory(
-        username="admin@test.com", groups=('DomainAdmins', ), password='{PLAIN}toto'
+        username="admin@test.com", groups=('DomainAdmins', ),
+        password='{PLAIN}toto'
     )
     MailboxFactory(address='admin', domain=dom, user=admin)
     account = UserFactory.create(
@@ -59,7 +60,8 @@ def populate_database():
 
     dom2 = DomainFactory.create(name='test2.com', quota=0)
     admin = UserFactory.create(
-        username='admin@test2.com', groups=('DomainAdmins',), password='{PLAIN}toto'
+        username='admin@test2.com', groups=('DomainAdmins',),
+        password='{PLAIN}toto'
     )
     MailboxFactory.create(address='admin', domain=dom2, user=admin)
     u = UserFactory.create(
diff --git a/modoboa/extensions/admin/forms/account.py b/modoboa/extensions/admin/forms/account.py
index a010ec0dc..dcda56951 100644
--- a/modoboa/extensions/admin/forms/account.py
+++ b/modoboa/extensions/admin/forms/account.py
@@ -447,8 +447,10 @@ class AccountForm(TabForms):
 
 
 class AccountWizard(WizardForm):
+
     """Account creation wizard.
     """
+
     def __init__(self, request):
         super(AccountWizard, self).__init__(request)
         self.add_step(
diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index 667ad6ef0..45bf1149e 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -328,8 +328,10 @@ class DomainForm(TabForms):
 
 
 class DomainWizard(WizardForm):
+
     """Domain creation wizard.
     """
+
     def __init__(self, request):
         super(DomainWizard, self).__init__(request)
         self.add_step(
diff --git a/modoboa/extensions/admin/forms/export.py b/modoboa/extensions/admin/forms/export.py
index bee201157..f1f8a868b 100644
--- a/modoboa/extensions/admin/forms/export.py
+++ b/modoboa/extensions/admin/forms/export.py
@@ -32,12 +32,14 @@ class ExportDataForm(forms.Form):
 
 
 class ExportDomainsForm(ExportDataForm):
+
     def __init__(self, *args, **kwargs):
         super(ExportDomainsForm, self).__init__(*args, **kwargs)
         self.fields["filename"].initial = "modoboa-domains.csv"
 
 
 class ExportIdentitiesForm(ExportDataForm):
+
     def __init__(self, *args, **kwargs):
         super(ExportIdentitiesForm, self).__init__(*args, **kwargs)
         self.fields["filename"].initial = "modoboa-identities.csv"
diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py
index a44ea9bf9..04c154603 100644
--- a/modoboa/extensions/admin/models/alias.py
+++ b/modoboa/extensions/admin/models/alias.py
@@ -15,6 +15,7 @@ from modoboa.lib.exceptions import (
 
 
 class Alias(AdminObject):
+
     """
     Mailbox alias.
     """
diff --git a/modoboa/extensions/admin/models/base.py b/modoboa/extensions/admin/models/base.py
index 5f3fd61a3..c576bdcad 100644
--- a/modoboa/extensions/admin/models/base.py
+++ b/modoboa/extensions/admin/models/base.py
@@ -6,6 +6,7 @@ from modoboa.lib.permissions import (
 
 
 class ObjectDates(models.Model):
+
     """Dates recording for admin objects
 
     This table keeps creation and last modification dates for Domains,
@@ -32,6 +33,7 @@ class ObjectDates(models.Model):
 
 
 class AdminObject(models.Model):
+
     """Abstract model to support dates
 
     Inherit from this model to automatically add the "dates" feature
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index e03a36d02..20b5d0c1e 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -27,6 +27,7 @@ class DomainManager(Manager):
 
 
 class Domain(AdminObject):
+
     """Mail domain.
     """
     name = models.CharField(ugettext_lazy('name'), max_length=100, unique=True,
diff --git a/modoboa/extensions/admin/views/import.py b/modoboa/extensions/admin/views/import.py
index a06a3a8cf..015db07d2 100644
--- a/modoboa/extensions/admin/views/import.py
+++ b/modoboa/extensions/admin/views/import.py
@@ -136,7 +136,7 @@ def importdata(request, formclass=ImportDataForm):
                 return render(request, "admin/import_done.html", {
                     "status": "ok", "msg": msg
                 })
-            except (ModoboaException), e:
+            except (ModoboaException) as e:
                 error = str(e)
 
     return render(request, "admin/import_done.html", {