diff --git a/modoboa/admin/handlers.py b/modoboa/admin/handlers.py
index 4da7e6304..4787cd343 100644
--- a/modoboa/admin/handlers.py
+++ b/modoboa/admin/handlers.py
@@ -42,6 +42,13 @@ def update_domain_mxs_and_mailboxes(sender, instance, **kwargs):
         q.delete()
     for mb in instance.mailbox_set.all():
         mb.rename_dir(instance.old_mail_homes[mb.pk])
+    # FIXME: could be replaced by
+    # .update(address=Concat("local_part", Value(instance.name)))
+    # if the local_part was stored aside the address...
+    for alias in instance.alias_set.all():
+        alias.address = "{}@{}".format(
+            alias.address.split("@", 1)[0], instance.name)
+        alias.save(update_fields=["address"])
 
 
 @receiver(signals.post_save, sender=models.DomainAlias)
diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 490253ec2..12b6954b0 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -133,6 +133,10 @@ class DomainTestCase(ModoTestCase):
         self.assertEqual(dom.name, "pouet.com")
         self.assertTrue(dom.enabled)
 
+        # Check if aliases were renamed too
+        self.assertTrue(
+            dom.alias_set.filter(address="postmaster@pouet.com").exists())
+
     def test_delete(self):
         """Test the removal of a domain
         """