diff --git a/archive/src/main/java/org/entcore/archive/controllers/DuplicationController.java b/archive/src/main/java/org/entcore/archive/controllers/DuplicationController.java
index 353b015350..0f3a2a5999 100644
--- a/archive/src/main/java/org/entcore/archive/controllers/DuplicationController.java
+++ b/archive/src/main/java/org/entcore/archive/controllers/DuplicationController.java
@@ -81,7 +81,7 @@ public void handle(Buffer buff)
         }
         catch(Exception e)
         {
-          log.error(e, e.getMessage());
+          log.error(e.getMessage(), e);
           badRequest(request);
           return;
         }
diff --git a/auth/src/main/java/org/entcore/auth/controllers/AuthController.java b/auth/src/main/java/org/entcore/auth/controllers/AuthController.java
index 21913ab9a6..04050f7d88 100644
--- a/auth/src/main/java/org/entcore/auth/controllers/AuthController.java
+++ b/auth/src/main/java/org/entcore/auth/controllers/AuthController.java
@@ -638,14 +638,14 @@ public void context(final HttpServerRequest request) {
 					pwdResetFormatByLang.put(lang, i18n.translate("password.rules.reset", Renders.getHost(request), lang));
 				} catch (Exception e) {
 					pwdResetFormatByLang.put(lang, "");
-					log.error("error when translating password.rules.reset in {0} : {1}", lang, e);
+					log.error(String.format("error when translating password.rules.reset in %s : ", lang), e);
 				}
 
 				try {
 					pwdActivationFormatByLang.put(lang, i18n.translate("password.rules.activation", Renders.getHost(request), lang));
 				} catch (Exception e) {
 					pwdActivationFormatByLang.put(lang, "");
-					log.error("error when translating password.rules.activation in {0} : {1}", lang, e);
+					log.error(String.format("error when translating password.rules.activation in %s : ", lang), e);
 				}
 			}
 		});
diff --git a/common/src/main/java/org/entcore/common/neo4j/Neo.java b/common/src/main/java/org/entcore/common/neo4j/Neo.java
index 47b9986bbf..e03c4b7d22 100644
--- a/common/src/main/java/org/entcore/common/neo4j/Neo.java
+++ b/common/src/main/java/org/entcore/common/neo4j/Neo.java
@@ -35,7 +35,7 @@ public class Neo  {
 
 	private Neo4j neo4j;
 
-	public Neo (Vertx vertx, EventBus eb, Logger log) {
+	public Neo (Vertx vertx, EventBus eb, Object log) {
 		neo4j = Neo4j.getInstance();
 	}
 
diff --git a/timeline/src/main/java/org/entcore/timeline/controllers/TimelineController.java b/timeline/src/main/java/org/entcore/timeline/controllers/TimelineController.java
index 9d16e95daa..ce3c082952 100644
--- a/timeline/src/main/java/org/entcore/timeline/controllers/TimelineController.java
+++ b/timeline/src/main/java/org/entcore/timeline/controllers/TimelineController.java
@@ -19,9 +19,6 @@
 
 package org.entcore.timeline.controllers;
 
-import io.vertx.core.*;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import fr.wseduc.bus.BusAddress;
 import fr.wseduc.rs.Delete;
 import fr.wseduc.rs.Get;
@@ -36,37 +33,34 @@
 import fr.wseduc.webutils.collections.TTLSet;
 import fr.wseduc.webutils.http.BaseController;
 import fr.wseduc.webutils.request.RequestUtils;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.eventbus.Message;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.logging.Logger;
+import io.vertx.core.logging.LoggerFactory;
 import io.vertx.core.shareddata.LocalMap;
 import org.entcore.common.cache.CacheService;
 import org.entcore.common.events.EventHelper;
 import org.entcore.common.events.EventStore;
 import org.entcore.common.events.EventStoreFactory;
-import org.entcore.common.http.filter.AdminFilter;
-import org.entcore.common.http.filter.AdmlOfStructures;
-import org.entcore.common.http.filter.ResourceFilter;
-import org.entcore.common.http.filter.SuperAdminFilter;
-import org.entcore.common.http.filter.Trace;
+import org.entcore.common.http.filter.*;
 import org.entcore.common.http.request.JsonHttpServerRequest;
 import org.entcore.common.mute.MuteHelper;
+import org.entcore.common.notification.NotificationUtils;
 import org.entcore.common.notification.TimelineHelper;
 import org.entcore.common.notification.TimelineNotificationsLoader;
-import org.entcore.common.notification.NotificationUtils;
 import org.entcore.common.user.UserInfos;
 import org.entcore.common.user.UserUtils;
 import org.entcore.timeline.Timeline;
 import org.entcore.timeline.controllers.helper.NotificationHelper;
-import org.entcore.timeline.events.CachedTimelineEventStore;
-import org.entcore.timeline.events.DefaultTimelineEventStore;
-import org.entcore.timeline.events.MobileTimelineEventStore;
-import org.entcore.timeline.events.SplitTimelineEventStore;
-import org.entcore.timeline.events.TimelineEventStore;
+import org.entcore.timeline.events.*;
 import org.entcore.timeline.events.TimelineEventStore.AdminAction;
 import org.entcore.timeline.services.TimelineConfigService;
 import org.entcore.timeline.services.TimelineMailerService;
-import io.vertx.core.eventbus.Message;
-import io.vertx.core.http.HttpServerRequest;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
 import org.vertx.java.core.http.RouteMatcher;
 
 import java.io.StringReader;