diff --git a/max/csrf.py b/max/csrf.py
index 2be08e5..da132a3 100644
--- a/max/csrf.py
+++ b/max/csrf.py
@@ -3,6 +3,7 @@ from functools import wraps
 from flask import request, session
 
 from max.crypto import constant_time_compare, get_random_string
+from max.log_format import format_log_fields
 from max.middlewares import BaseMiddleware, get_real_remote_addr
 
 CSRF_TOKEN_KEY = "csrf_token"
@@ -33,12 +34,14 @@ class CsrfMiddleware(BaseMiddleware):
         # Stateless check, so it also protects routes without a session (login)
         if not self.is_origin_allowed():
             self.app.logger.debug(
-                'Blocked cross-origin request %s %s origin="%s" sec_fetch_site="%s" from %s',
-                request.method,
-                request.path,
-                request.headers.get("Origin"),
-                request.headers.get("Sec-Fetch-Site"),
-                get_real_remote_addr(self.app),
+                "Blocked cross-origin request %s",
+                format_log_fields(
+                    method=request.method,
+                    path=request.path,
+                    origin=request.headers.get("Origin"),
+                    sec_fetch_site=request.headers.get("Sec-Fetch-Site"),
+                    ip=get_real_remote_addr(self.app),
+                ),
             )
             return "Cross-origin request blocked", 403
 
diff --git a/max/log.py b/max/log.py
index 6e58a10..d09f536 100644
--- a/max/log.py
+++ b/max/log.py
@@ -6,6 +6,7 @@ from logging.config import dictConfig
 from flask import g, request, session
 
 from max.db import database
+from max.log_format import format_log_fields
 from max.middlewares import get_real_remote_addr
 from max.translations import TranslationHandler
 
@@ -59,21 +60,24 @@ def init_request_logging(app):
         # so the response may be None
         response = g.get("response")
         start = g.get("request_start")
-        time_in_ms = f"{(time.time() - start) * 1000:.2f}" if start else None
+        time_in_ms = round((time.time() - start) * 1000, 2) if start else None
 
         app.logger.info(
-            'method=%s url=%s ip=%s user_agent="%s" referrer="%s" db_queries=%s '
-            + "status=%s content_length=%s user_id=%s session=%s lang=%s time_ms=%s",
-            request.method,
-            request.url,
-            get_real_remote_addr(app),
-            request.user_agent,
-            request.referrer,
-            database.collect_query_count(),
-            response.status_code if response is not None else 500,
-            response.content_length if response is not None else None,
-            session.get("user_id"),
-            session.get_log_id(),
-            TranslationHandler.get_language(),
-            time_in_ms,
+            "%s",
+            format_log_fields(
+                method=request.method,
+                url=request.url,
+                ip=get_real_remote_addr(app),
+                user_agent=request.user_agent.string,
+                referrer=request.referrer,
+                db_queries=database.collect_query_count(),
+                status=response.status_code if response is not None else 500,
+                content_length=(
+                    response.content_length if response is not None else None
+                ),
+                user_id=session.get("user_id"),
+                session=session.get_log_id(),
+                lang=TranslationHandler.get_language(),
+                time_ms=time_in_ms,
+            ),
         )