diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/aup/AupSignatureController.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/aup/AupSignatureController.java
index 5780e1a00..170ae7874 100644
--- a/iam-login-service/src/main/java/it/infn/mw/iam/api/aup/AupSignatureController.java
+++ b/iam-login-service/src/main/java/it/infn/mw/iam/api/aup/AupSignatureController.java
@@ -48,6 +48,7 @@
 import it.infn.mw.iam.audit.events.aup.AupSignedEvent;
 import it.infn.mw.iam.audit.events.aup.AupSignedOnBehalfEvent;
 import it.infn.mw.iam.core.time.TimeProvider;
+import it.infn.mw.iam.notification.NotificationFactory;
 import it.infn.mw.iam.persistence.model.IamAccount;
 import it.infn.mw.iam.persistence.model.IamAup;
 import it.infn.mw.iam.persistence.model.IamAupSignature;
@@ -69,15 +70,17 @@ public class AupSignatureController {
   private final IamAupRepository aupRepo;
   private final TimeProvider timeProvider;
   private final ApplicationEventPublisher eventPublisher;
+  private final NotificationFactory notificationFactory;
   public AupSignatureController(AupSignatureConverter conv, AccountUtils utils,
       IamAupSignatureRepository signatureRepo, IamAupRepository aupRepo, TimeProvider timeProvider,
-      ApplicationEventPublisher publisher) {
+      ApplicationEventPublisher publisher, NotificationFactory notificationFactory) {
     this.signatureConverter = conv;
     this.accountUtils = utils;
     this.signatureRepo = signatureRepo;
     this.aupRepo = aupRepo;
     this.timeProvider = timeProvider;
     this.eventPublisher = publisher;
+    this.notificationFactory = notificationFactory;
   }
 
   private Supplier<AupNotFoundError> aupNotFoundException() {
@@ -194,6 +197,7 @@ public void deleteSignatureForAccount(@PathVariable String accountId,
         eventPublisher
           .publishEvent(AupSignatureDeletedEvent.deletedByClient(this, principal, signature.get()));
       }
+      notificationFactory.createAupSignatureRequestMessage(signatureAccount);
     }
   }
 
diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/notification/TransientNotificationFactory.java b/iam-login-service/src/main/java/it/infn/mw/iam/notification/TransientNotificationFactory.java
index 1cef9174f..07679a4bf 100644
--- a/iam-login-service/src/main/java/it/infn/mw/iam/notification/TransientNotificationFactory.java
+++ b/iam-login-service/src/main/java/it/infn/mw/iam/notification/TransientNotificationFactory.java
@@ -395,7 +395,7 @@ public IamEmailNotification createAccountRestoredMessage(IamAccount account) {
     model.put(RECIPIENT_FIELD, recipient);
     model.put(ORGANISATION_NAME, organisationName);
 
-    String subject = "Account restored";
+    String subject = String.format("[%s IAM] Account restored", organisationName);
 
     IamEmailNotification notification = createMessage("accountRestored.ftl", model,
         IamNotificationType.ACCOUNT_RESTORED, subject, asList(account.getUserInfo().getEmail()));
@@ -410,6 +410,7 @@ protected IamEmailNotification createMessage(String templateName, Map<String, Ob
       IamNotificationType messageType, String subject, List<String> receiverAddress) {
 
     try {
+      String formattedSubject = String.format("[%s IAM] %s", organisationName, subject);
       Template template = freeMarkerConfiguration.getTemplate(templateName);
       String body = FreeMarkerTemplateUtils.processTemplateIntoString(template, model);
 
@@ -417,7 +418,7 @@ protected IamEmailNotification createMessage(String templateName, Map<String, Ob
 
       message.setUuid(UUID.randomUUID().toString());
       message.setType(messageType);
-      message.setSubject(subject);
+      message.setSubject(formattedSubject);
       message.setBody(body);
       message.setCreationTime(new Date());
       message.setDeliveryStatus(IamDeliveryStatus.PENDING);
diff --git a/iam-login-service/src/test/java/it/infn/mw/iam/test/notification/RegistrationFlowNotificationTests.java b/iam-login-service/src/test/java/it/infn/mw/iam/test/notification/RegistrationFlowNotificationTests.java
index 2ef619a99..02bda33ea 100644
--- a/iam-login-service/src/test/java/it/infn/mw/iam/test/notification/RegistrationFlowNotificationTests.java
+++ b/iam-login-service/src/test/java/it/infn/mw/iam/test/notification/RegistrationFlowNotificationTests.java
@@ -110,6 +110,10 @@ public void tearDown() throws InterruptedException {
     notificationDelivery.clearDeliveredNotifications();
   }
 
+  public String formatSubject(String key) {
+    return String.format("[%s IAM] %s", organisationName, properties.getSubject().get(key));
+  }
+
   @Test
   public void testSendWithEmptyQueue() {
 
@@ -145,7 +149,7 @@ public void testApproveFlowNotifications() throws Exception {
 
     IamEmailNotification message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("confirmation")));
+    assertThat(message.getSubject(), equalTo(formatSubject("confirmation")));
 
     notificationDelivery.clearDeliveredNotifications();
 
@@ -161,7 +165,7 @@ public void testApproveFlowNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("adminHandleRequest")));
+    assertThat(message.getSubject(), equalTo(formatSubject("adminHandleRequest")));
 
     assertThat(message.getReceivers(), hasSize(1));
     assertThat(message.getReceivers().get(0).getEmailAddress(),
@@ -180,7 +184,7 @@ public void testApproveFlowNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("activated")));
+    assertThat(message.getSubject(), equalTo(formatSubject("activated")));
     assertThat(message.getBody(), containsString(request.getUsername()));
 
   }
@@ -212,7 +216,7 @@ public void testRejectFlowNoMotivationNotifications() throws Exception {
 
     IamEmailNotification message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("confirmation")));
+    assertThat(message.getSubject(), equalTo(formatSubject("confirmation")));
 
     notificationDelivery.clearDeliveredNotifications();
 
@@ -228,7 +232,7 @@ public void testRejectFlowNoMotivationNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("adminHandleRequest")));
+    assertThat(message.getSubject(), equalTo(formatSubject("adminHandleRequest")));
 
     assertThat(message.getReceivers(), hasSize(1));
     assertThat(message.getReceivers().get(0).getEmailAddress(),
@@ -247,7 +251,7 @@ public void testRejectFlowNoMotivationNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("rejected")));
+    assertThat(message.getSubject(), equalTo(formatSubject("rejected")));
     assertThat(message.getBody(),
         not(containsString("The administrator has provided the following motivation")));
 
@@ -280,7 +284,7 @@ public void testRejectFlowMotivationNotifications() throws Exception {
 
     IamEmailNotification message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("confirmation")));
+    assertThat(message.getSubject(), equalTo(formatSubject("confirmation")));
 
     notificationDelivery.clearDeliveredNotifications();
 
@@ -296,7 +300,7 @@ public void testRejectFlowMotivationNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("adminHandleRequest")));
+    assertThat(message.getSubject(), equalTo(formatSubject("adminHandleRequest")));
 
     assertThat(message.getReceivers(), hasSize(1));
     assertThat(message.getReceivers().get(0).getEmailAddress(),
@@ -317,11 +321,10 @@ public void testRejectFlowMotivationNotifications() throws Exception {
 
     message = notificationDelivery.getDeliveredNotifications().get(0);
 
-    assertThat(message.getSubject(), equalTo(properties.getSubject().get("rejected")));
+    assertThat(message.getSubject(), equalTo(formatSubject("rejected")));
     assertThat(message.getBody(),
         containsString("The administrator has provided the following motivation"));
-    assertThat(message.getBody(),
-        containsString("We hate you"));
+    assertThat(message.getBody(), containsString("We hate you"));
 
   }