diff --git a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java
index 80de03c396..70e9ddf1aa 100644
--- a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java
+++ b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java
@@ -157,16 +157,14 @@ protected static void sendToSlack(String err) {
     }
 
     protected String basicError(String err, LogDb db) {
-        if(Context.accountId.get() != null){
-            err = String.format("%s\nAccount id: %d", err, Context.accountId.get());
-        }
-        logger.error(err);
+        String formatted = getFormattedMessage(err);
+        logger.error(formatted);
         try{
-            insert(err, "error", db);
+            insert(formatted, "error", db);
         } catch (Exception e){
 
         }
-        return err;
+        return formatted;
     }
 
     public void errorAndAddToDb(String err, LogDb db) {
@@ -208,8 +206,7 @@ public void errorAndAddToDb(Exception e, String err, LogDb db) {
 
     @Deprecated
     public void infoAndAddToDb(String info, LogDb db) {
-        String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA";
-        String infoMessage = "acc: " + accountId + ", " + info;
+        String infoMessage = getFormattedMessage(info);
         logger.info(infoMessage);
         try{
             insert(infoMessage, "info",db);
@@ -219,8 +216,7 @@ public void infoAndAddToDb(String info, LogDb db) {
     }
 
     public void warnAndAddToDb(String info, LogDb db) {
-        String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA";
-        String infoMessage = "acc: " + accountId + ", " + info;
+        String infoMessage = getFormattedMessage(info);
         logger.info(infoMessage);
         try{
             insert(infoMessage, "warn",db);
@@ -331,19 +327,27 @@ public List<Log> fetchLogRecords(int logFetchStartTime, int logFetchEndTime, Log
     }
 
     public void info(String message, Object... vars) {
-        logger.info(message, vars);
+        logger.info(getFormattedMessage(message), vars);
     }
 
     public void error(String errorMessage, Object... vars) {
-        logger.error(errorMessage, vars);
+        logger.error(getFormattedMessage(errorMessage), vars);
     }
 
     public void debug(String message, Object... vars) {
-        logger.debug(message, vars);
+        logger.debug(getFormattedMessage(message), vars);
     }
 
     public void warn(String message, Object... vars) {
-        logger.warn(message, vars);
+        logger.warn(getFormattedMessage(message), vars);
+    }
+
+    /**
+     * Helper to prefix the message with accountId consistently.
+     */
+    private String getFormattedMessage(String message) {
+        String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA";
+        return "accountId: " + accountId + " message: " + message;
     }
 
     public void debugAndAddToDb(String message) {
@@ -359,8 +363,7 @@ public void debugAndAddToDbCount(String message) {
     }
 
     public void debugAndAddToDb(String message, LogDb db) {
-        String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA";
-        String debugMessage = "acc: " + accountId + ", " + message;
+        String debugMessage = getFormattedMessage(message);
         debug(debugMessage);
         try{
             insert(debugMessage, "debug", db);