diff --git a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
index d55fdbc..4fdf8a7 100644
--- a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
+++ b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
@@ -142,7 +142,6 @@
       throws NoSuchProjectException {
     Config cfg = cfgFactory.getProjectPluginConfig(allProjectsName, name);
 
-
     Set<ConfigEntry> newConf = new HashSet<>();
     Set<String> destinations = new HashSet<>();
     Set<String> wildcardDestinations = new HashSet<>();
@@ -253,6 +252,13 @@
       throws IOException, ConfigInvalidException, GitAPIException, AuthException,
           PermissionBackendException {
     permissionBackend.user(identifiedUser).check(GlobalPermission.ADMINISTRATE_SERVER);
+    info(
+        "manual trigger for %s:%s by %d. Config: %s",
+        resource.getBranchKey().getParentKey().get(),
+        resource.getBranchKey().get(),
+        identifiedUser.get().getAccountId().get(),
+        configurationToString());
+
     update(resource.getProjectState().getProject().getName(), resource.getRef(), false);
     return Response.none();
   }
