diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py
index 8ef596627..6434a339e 100644
--- a/modoboa/extensions/postfix_autoreply/__init__.py
+++ b/modoboa/extensions/postfix_autoreply/__init__.py
@@ -88,10 +88,17 @@ def onCreateDomain(user, domain):
     transport.save()
 
 
+@events.observe("DomainModified")
+def onDomainModified(domain):
+    if domain.oldname == domain.name:
+        return
+    Transport.objects.filter(domain="autoreply.%s" % domain.oldname) \
+        .update(domain="autoreply.%s" % domain.name)
+
+
 @events.observe("DeleteDomain")
 def onDeleteDomain(domain):
-    trans = Transport.objects.get(domain="autoreply.%s" % domain.name)
-    trans.delete()
+    Transport.objects.filter(domain="autoreply.%s" % domain.name).delete()
 
 
 @events.observe("CreateMailbox")