diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py
index 75ec95f28..d1da8c872 100644
--- a/modoboa/admin/forms.py
+++ b/modoboa/admin/forms.py
@@ -136,7 +136,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
             if old_mail_homes is not None:
                 self.update_mailbox_quotas(d)
                 for mb in d.mailbox_set.all():
-                    mb.rename_dir()
+                    mb.rename_dir(old_mail_homes[mb.id])
 
         return d