diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py
index 9b63253dd..452764949 100644
--- a/modoboa/admin/forms.py
+++ b/modoboa/admin/forms.py
@@ -79,7 +79,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
             hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False)
             if hm == "yes":
                 if self.oldname is not None and d.name != self.oldname:
-                    old_mail_homes = {mb.id: mb.mail_home for mb in d.mailbox_set.all()}
+                    old_mail_homes = dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all())
             d.save()
             if old_mail_homes is not None:
                 for mb in d.mailbox_set.all():
diff --git a/modoboa/extensions/amavis/app_settings.py b/modoboa/extensions/amavis/app_settings.py
index 36cfb6686..02ec1d6a1 100644
--- a/modoboa/extensions/amavis/app_settings.py
+++ b/modoboa/extensions/amavis/app_settings.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from django.utils.translation import ugettext_lazy as _
 from django import forms
-from modoboa.lib.parameters import AdminParametersForm
+from modoboa.lib.parameters import AdminParametersForm, UserParametersForm
 from modoboa.lib.formutils import SeparatorField, YesNoField